[FFmpeg-devel] [PATCH] vf_alphamerge: Fix reversed conditional
Steven Robertson
steven at strobe.cc
Fri Jul 27 09:01:19 CEST 2012
Signed-off-by: Steven Robertson <steven at strobe.cc>
---
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;
--
1.7.11.2
More information about the ffmpeg-devel
mailing list