Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavfilter / vf_alphamerge.c

diff --git a/libavfilter/vf_alphamerge.c b/libavfilter/vf_alphamerge.c
index 278f9a3e03e8ccfbe4300cbe025f2f1a3111ea5c..fdcc01346be8b6d743544373a63dbd2dd93b9c8c 100644 (file)
--- a/libavfilter/vf_alphamerge.c
+++ b/libavfilter/vf_alphamerge.c
@@ -168,7 +168,7 @@ static int request_frame(AVFilterLink *outlink)
 
     merge->frame_requested = 1;
     while (merge->frame_requested) {
-        in = ff_bufqueue_peek(&merge->queue_main, 0) ? 0 : 1;
+        in = ff_bufqueue_peek(&merge->queue_main, 0) ? 1 : 0;
         ret = ff_request_frame(ctx->inputs[in]);
         if (ret < 0)
             return ret;