avfilter/vf_zoompan: unbreak filtering with video input
authorPaul B Mahol <onemda@gmail.com>
Sun, 24 Jan 2016 18:12:33 +0000 (19:12 +0100)
committerPaul B Mahol <onemda@gmail.com>
Sun, 24 Jan 2016 18:17:39 +0000 (19:17 +0100)
Inserting fifo appears to be working solution to not get
filter_frame request we do not want.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
libavfilter/vf_zoompan.c

index 0dc5f37..fe8dc57 100644 (file)
@@ -221,10 +221,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
     double nb_frames;
     int ret;
 
-    if (s->in) {
-        av_frame_free(&in);
-        return 0;
-    }
+    av_assert0(s->in == NULL);
 
     s->finished = 0;
     s->var_values[VAR_IN_W]  = s->var_values[VAR_IW] = in->width;
@@ -336,6 +333,7 @@ static const AVFilterPad inputs[] = {
         .name         = "default",
         .type         = AVMEDIA_TYPE_VIDEO,
         .filter_frame = filter_frame,
+        .needs_fifo   = 1,
     },
     { NULL }
 };