From a45e96a54fc408bc1ea5b09572354f63b1c4b523 Mon Sep 17 00:00:00 2001
From: Nicolas George <george@nsup.org>
Date: Fri, 2 Oct 2015 16:12:38 +0200
Subject: lavfi/vf_alphamerge: remove looping on request_frame().

---
 libavfilter/vf_alphamerge.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'libavfilter')

diff --git a/libavfilter/vf_alphamerge.c b/libavfilter/vf_alphamerge.c
index 5f0da35eba..3c62b59ad3 100644
--- a/libavfilter/vf_alphamerge.c
+++ b/libavfilter/vf_alphamerge.c
@@ -36,7 +36,6 @@
 enum { Y, U, V, A };
 
 typedef struct {
-    int frame_requested;
     int is_packed_rgb;
     uint8_t rgba_map[4];
     struct FFBufQueue queue_main;
@@ -146,7 +145,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
         main_buf = ff_bufqueue_get(&merge->queue_main);
         alpha_buf = ff_bufqueue_get(&merge->queue_alpha);
 
-        merge->frame_requested = 0;
         draw_frame(ctx, main_buf, alpha_buf);
         ret = ff_filter_frame(ctx->outputs[0], main_buf);
         av_frame_free(&alpha_buf);
@@ -160,13 +158,11 @@ static int request_frame(AVFilterLink *outlink)
     AlphaMergeContext *merge = ctx->priv;
     int in, ret;
 
-    merge->frame_requested = 1;
-    while (merge->frame_requested) {
+    /* TODO reindent */
         in = ff_bufqueue_peek(&merge->queue_main, 0) ? 1 : 0;
         ret = ff_request_frame(ctx->inputs[in]);
         if (ret < 0)
             return ret;
-    }
     return 0;
 }
 
-- 
cgit v1.2.3