virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

lavfi/buffersink: loop over ff_request_frame().

Browse Source 
Do not assume that ff_request_frame() returning success
implies a frame has arrived in the FIFO.
Instead, just loop until a frame is in the FIFO.
It does not change anything since the same loop is present
in ff_request_frame(), confirmed by an assertion.
This commit is contained in:
Nicolas George
2015-08-26 00:15:22 +02:00
parent 4bb6cb4c7d
commit 807d4b6355
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavfilter/buffersink.c
View File

@@ -133,7 +133,7 @@ int attribute_align_arg av_buffersink_get_frame_flags(AVFilterContext *ctx, AVFr
AVFrame *cur_frame; AVFrame *cur_frame;
/* no picref available, fetch it from the filterchain */ /* no picref available, fetch it from the filterchain */
if (!av_fifo_size(buf->fifo)) { while (!av_fifo_size(buf->fifo)) {
if (inlink->closed) if (inlink->closed)
return AVERROR_EOF; return AVERROR_EOF;
if (flags & AV_BUFFERSINK_FLAG_NO_REQUEST) if (flags & AV_BUFFERSINK_FLAG_NO_REQUEST)
@@ -142,9 +142,6 @@ int attribute_align_arg av_buffersink_get_frame_flags(AVFilterContext *ctx, AVFr
return ret; return ret;
} }
if (!av_fifo_size(buf->fifo))
return AVERROR(EINVAL);
if (flags & AV_BUFFERSINK_FLAG_PEEK) { if (flags & AV_BUFFERSINK_FLAG_PEEK) {
cur_frame = *((AVFrame **)av_fifo_peek2(buf->fifo, 0)); cur_frame = *((AVFrame **)av_fifo_peek2(buf->fifo, 0));
if ((ret = av_frame_ref(frame, cur_frame)) < 0) if ((ret = av_frame_ref(frame, cur_frame)) < 0)