aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-06-14 17:13:51 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2016-08-13 13:08:57 +0200
commit694d37eb52ad296db8e038766750207ad61094e8 (patch)
tree5e8fd8ebdd5cb7df53498dd1bd928adae0c9acbc
parent4e5d1c45f111966f37176757d4e75c9ec9fe4aac (diff)
downloadandroid_external_ffmpeg-694d37eb52ad296db8e038766750207ad61094e8.tar.gz
android_external_ffmpeg-694d37eb52ad296db8e038766750207ad61094e8.tar.bz2
android_external_ffmpeg-694d37eb52ad296db8e038766750207ad61094e8.zip
avfilter/vf_telecine: Make frame writable before writing into it
Fixes Ticket 5627 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit fa0097e008a145ea8324879d4e24c1881bb86279) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavfilter/vf_telecine.c2
-rw-r--r--tests/ref/fate/filter-pixfmts-fieldmatch2
2 files changed, 3 insertions, 1 deletions
diff --git a/libavfilter/vf_telecine.c b/libavfilter/vf_telecine.c
index 182c670849..58babca9a1 100644
--- a/libavfilter/vf_telecine.c
+++ b/libavfilter/vf_telecine.c
@@ -190,6 +190,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inpicref)
}
if (s->occupied) {
+ av_frame_make_writable(s->frame[nout]);
for (i = 0; i < s->nb_planes; i++) {
// fill in the EARLIER field from the buffered pic
av_image_copy_plane(s->frame[nout]->data[i] + s->frame[nout]->linesize[i] * s->first_field,
@@ -213,6 +214,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inpicref)
while (len >= 2) {
// output THIS image as-is
+ av_frame_make_writable(s->frame[nout]);
for (i = 0; i < s->nb_planes; i++)
av_image_copy_plane(s->frame[nout]->data[i], s->frame[nout]->linesize[i],
inpicref->data[i], inpicref->linesize[i],
diff --git a/tests/ref/fate/filter-pixfmts-fieldmatch b/tests/ref/fate/filter-pixfmts-fieldmatch
index 44622d060c..99946c8d1d 100644
--- a/tests/ref/fate/filter-pixfmts-fieldmatch
+++ b/tests/ref/fate/filter-pixfmts-fieldmatch
@@ -1,5 +1,5 @@
yuv410p a6c9b4065e8253d8120772f69be0bf04
yuv411p b913e634ad37ce046240252bed8681fb
-yuv420p d448d95326eadeeb12ea0cc348067958
+yuv420p a9286560141eb14595e427dbe5829b00
yuv422p 11ad22ce00c5e8a30d0472f29fb15434
yuv444p 9350a3f23cd7d95ec441a49f63f55953