ffmpeg | branch: master | Paul B Mahol <one...@gmail.com> | Sun Jan 24 19:12:33 2016 +0100| [8a343443796a334bd8aa5b342daf5e48049f333f] | committer: Paul B Mahol
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 <one...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8a343443796a334bd8aa5b342daf5e48049f333f --- libavfilter/vf_zoompan.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_zoompan.c b/libavfilter/vf_zoompan.c index 0dc5f37..fe8dc57 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 } }; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
