diff options
| author | Paul B Mahol <onemda@gmail.com> | 2015-09-11 10:09:33 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2015-09-12 02:37:32 +0000 |
| commit | 16f08b7a0918ec93d377bfd151e6551da4c3b38f (patch) | |
| tree | 5037859ead381225402ce72cf464351810f77c73 /libavfilter | |
| parent | 349970a67a1911cd522ee133daa7476b6301e323 (diff) | |
avfilter/vf_framerate: unbreak flushing
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/vf_framerate.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavfilter/vf_framerate.c b/libavfilter/vf_framerate.c index f4ff481adb..1072e2d545 100644 --- a/libavfilter/vf_framerate.c +++ b/libavfilter/vf_framerate.c @@ -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; |