virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avfilter/vf_zoompan: unbreak filtering with video input

Browse Source 
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>
This commit is contained in:
Paul B Mahol
2016-01-24 19:12:33 +01:00
parent 794b015035
commit 8a34344379
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavfilter/vf_zoompan.c
View File

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