diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2013-01-10 19:44:45 +0100 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2013-01-10 21:55:02 +0100 |
| commit | 7e5c5fa5fc8f99be66341b95257d42fa2d1f0fbb (patch) | |
| tree | 59cb7eef1731b2c139c1b1f3d64a4405f6ef404b /libavfilter | |
| parent | a74548521b2348aea7dc3a69ce814dc7b0d6aca8 (diff) | |
| download | ffmpeg-7e5c5fa5fc8f99be66341b95257d42fa2d1f0fbb.tar.gz | |
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.
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/vf_overlay.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c index b71ef41392..d44677fddc 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; } |