MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avfilter/vf_framerate: unbreak flushing

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2015-09-11 10:09:33 +00:00
parent 349970a67a
commit 16f08b7a09
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavfilter/vf_framerate.c
View File

@ -666,9 +666,12 @@ static int request_frame(AVFilterLink *outlink)
// if there is no "next" frame AND we are not in flush then get one from our input filter
if (!s->srce[s->frst] && !s->flush) {
ff_dlog(ctx, "request_frame() call source's request_frame()\n");
if ((val = ff_request_frame(outlink->src->inputs[0])) < 0) {
val = ff_request_frame(outlink->src->inputs[0]);
if (val < 0 && (val != AVERROR_EOF)) {
ff_dlog(ctx, "request_frame() source's request_frame() returned error:%d\n", val);
return val;
} else if (val == AVERROR_EOF) {
s->flush = 1;
}
ff_dlog(ctx, "request_frame() source's request_frame() returned:%d\n", val);
return 0;