From: Nicolas George <george@nsup.org>
Date: Tue, 25 Aug 2015 22:15:22 +0000 (+0200)
Subject: lavfi/buffersink: loop over ff_request_frame().
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=807d4b635567e51108ea3a6a774336321c3250e5;p=ffmpeg

lavfi/buffersink: loop over ff_request_frame().

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.
---

diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c
index e693161554c..3206bd9dfe4 100644
--- a/libavfilter/buffersink.c
+++ b/libavfilter/buffersink.c
@@ -133,7 +133,7 @@ int attribute_align_arg av_buffersink_get_frame_flags(AVFilterContext *ctx, AVFr
     AVFrame *cur_frame;
 
     /* no picref available, fetch it from the filterchain */
-    if (!av_fifo_size(buf->fifo)) {
+    while (!av_fifo_size(buf->fifo)) {
         if (inlink->closed)
             return AVERROR_EOF;
         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;
     }
 
-    if (!av_fifo_size(buf->fifo))
-        return AVERROR(EINVAL);
-
     if (flags & AV_BUFFERSINK_FLAG_PEEK) {
         cur_frame = *((AVFrame **)av_fifo_peek2(buf->fifo, 0));
         if ((ret = av_frame_ref(frame, cur_frame)) < 0)