[FFmpeg-cvslog] lavfi/vf_overlay: check that filter_frame does not return EAGAIN.

Nicolas George git at videolan.org
Thu Jan 10 21:55:25 CET 2013


ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Thu Jan 10 19:44:45 2013 +0100| [7e5c5fa5fc8f99be66341b95257d42fa2d1f0fbb] | committer: Nicolas George

lavfi/vf_overlay: check that filter_frame does not return EAGAIN.

EAGAIN is used internally in the code; it currently does not make
sense as a return code from the next filter.

Should fix CID966655.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7e5c5fa5fc8f99be66341b95257d42fa2d1f0fbb
---

 libavfilter/vf_overlay.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c
index b71ef41..d44677f 100644
--- a/libavfilter/vf_overlay.c
+++ b/libavfilter/vf_overlay.c
@@ -473,6 +473,7 @@ static int try_filter_frame(AVFilterContext *ctx, AVFilterBufferRef *mainpic)
     if (over->overpicref)
         blend_image(ctx, mainpic, over->overpicref, over->x, over->y);
     ret = ff_filter_frame(ctx->outputs[0], mainpic);
+    av_assert1(ret != AVERROR(EAGAIN));
     over->frame_requested = 0;
     return ret;
 }



More information about the ffmpeg-cvslog mailing list