RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Derek Buitenhuis 2016-02-16 19:48:39 +00:00
parent c82d31808b fb25d99b0a
commit 9a9f3f151f
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/buffersrc.c
View File

@ -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)