Merge commit 'dca23ffbc7568c9af5c5fbaa86e6a0761ecae50c'

[ffmpeg] / libavfilter / vf_thumbnail.c

diff --git a/libavfilter/vf_thumbnail.c b/libavfilter/vf_thumbnail.c
index c378791666c0b4e108b7e249ce6541104c15995d..417ccd56d0947e8c4351cd4db98a675c3da4a315 100644 (file)
--- a/libavfilter/vf_thumbnail.c
+++ b/libavfilter/vf_thumbnail.c
@@ -171,20 +171,16 @@ static int request_frame(AVFilterLink *link)
 {
     AVFilterContext *ctx = link->src;
     ThumbContext *s = ctx->priv;
+    int ret = ff_request_frame(ctx->inputs[0]);
 
-    /* loop until a frame thumbnail is available (when a frame is queued,
-     * s->n is reset to zero) */
-    do {
-        int ret = ff_request_frame(ctx->inputs[0]);
-        if (ret == AVERROR_EOF && s->n) {
-            ret = ff_filter_frame(link, get_best_frame(ctx));
-            if (ret < 0)
-                return ret;
-            ret = AVERROR_EOF;
-        }
+    if (ret == AVERROR_EOF && s->n) {
+        ret = ff_filter_frame(link, get_best_frame(ctx));
         if (ret < 0)
             return ret;
-    } while (s->n);
+        ret = AVERROR_EOF;
+    }
+    if (ret < 0)
+        return ret;
     return 0;
 }