diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 19:48:39 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 19:48:39 +0000 |
| commit | 9a9f3f151fa2d9cd66fdfdf72722465d11c296bb (patch) | |
| tree | 34ddcde617607d17103d1e0f49ed4b03125f62f2 /libavfilter/buffersrc.c | |
| parent | c82d31808bdcbafb1489cfb5d8e22c5272b484eb (diff) | |
| parent | fb25d99b0a5e21fb8cc184c7a9d3736387778266 (diff) | |
| download | ffmpeg-9a9f3f151fa2d9cd66fdfdf72722465d11c296bb.tar.gz | |
Merge commit 'fb25d99b0a5e21fb8cc184c7a9d3736387778266'
This commit is a no-op.
* commit 'fb25d99b0a5e21fb8cc184c7a9d3736387778266':
buffersrc: do not discard the error from ff_filter_frame()
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavfilter/buffersrc.c')
| -rw-r--r-- | libavfilter/buffersrc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index 3920b048db..c09379013c 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -370,6 +370,7 @@ static int request_frame(AVFilterLink *link) { BufferSourceContext *c = link->src->priv; AVFrame *frame; + int ret; if (!av_fifo_size(c->fifo)) { if (c->eof) @@ -379,7 +380,9 @@ static int request_frame(AVFilterLink *link) } av_fifo_generic_read(c->fifo, &frame, sizeof(frame), NULL); - return ff_filter_frame(link, frame); + ret = ff_filter_frame(link, frame); + + return ret; } static int poll_frame(AVFilterLink *link) |