Commit b3841db1 authored by Steven Robertson's avatar Steven Robertson Committed by Carl Eugen Hoyos

vf_alphamerge: Fix reversed conditional

Reviewed-by: Nicolas George
parent 789f8cb0
...@@ -168,7 +168,7 @@ static int request_frame(AVFilterLink *outlink) ...@@ -168,7 +168,7 @@ static int request_frame(AVFilterLink *outlink)
merge->frame_requested = 1; merge->frame_requested = 1;
while (merge->frame_requested) { 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]); ret = ff_request_frame(ctx->inputs[in]);
if (ret < 0) if (ret < 0)
return ret; return ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment