[FFmpeg-cvslog] vf_alphamerge: Fix reversed conditional

[Steven Robertson]

ffmpeg | branch: master | Steven Robertson <steven at strobe.cc> | Fri Jul 27 14:00:04 2012 +0200| [b3841db133979721972807f67000789b8b3fa015] | committer: Carl Eugen Hoyos

vf_alphamerge: Fix reversed conditional

Reviewed-by: Nicolas George

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b3841db133979721972807f67000789b8b3fa015
---

 libavfilter/vf_alphamerge.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/vf_alphamerge.c b/libavfilter/vf_alphamerge.c
index 278f9a3..fdcc013 100644
--- 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;