Commit d7849248 authored by Nicolas George's avatar Nicolas George

lavfi/vf_alphamerge: reindent after last commit.

parent 35c3043e
...@@ -158,11 +158,10 @@ static int request_frame(AVFilterLink *outlink) ...@@ -158,11 +158,10 @@ static int request_frame(AVFilterLink *outlink)
AlphaMergeContext *merge = ctx->priv; AlphaMergeContext *merge = ctx->priv;
int in, ret; int in, ret;
/* TODO reindent */ in = ff_bufqueue_peek(&merge->queue_main, 0) ? 1 : 0;
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;
return 0; return 0;
} }
......
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