summaryrefslogtreecommitdiff
path: root/libavfilter/vf_zoompan.c
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2016-01-24 19:12:33 +0100
committerPaul B Mahol <onemda@gmail.com>2016-01-24 19:17:39 +0100
commit8a343443796a334bd8aa5b342daf5e48049f333f (patch)
tree4679472d5c84d5f1201ffcadb1af019d417ec3d0 /libavfilter/vf_zoompan.c
parent794b015035a50ab1f709c49bdf5403b44a2dcbd6 (diff)
avfilter/vf_zoompan: unbreak filtering with video input
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>
Diffstat (limited to 'libavfilter/vf_zoompan.c')
-rw-r--r--libavfilter/vf_zoompan.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/libavfilter/vf_zoompan.c b/libavfilter/vf_zoompan.c
index 0dc5f37058..fe8dc575e2 100644
--- a/libavfilter/vf_zoompan.c
+++ b/libavfilter/vf_zoompan.c
@@ -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 }
};