From d7849248dd0db4fb967188bbefb4d044de85b947 Mon Sep 17 00:00:00 2001 From: Nicolas George Date: Fri, 2 Oct 2015 16:12:51 +0200 Subject: lavfi/vf_alphamerge: reindent after last commit. --- libavfilter/vf_alphamerge.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'libavfilter') diff --git a/libavfilter/vf_alphamerge.c b/libavfilter/vf_alphamerge.c index 3c62b59ad3..a478de527a 100644 --- a/libavfilter/vf_alphamerge.c +++ b/libavfilter/vf_alphamerge.c @@ -158,11 +158,10 @@ static int request_frame(AVFilterLink *outlink) AlphaMergeContext *merge = ctx->priv; int in, ret; - /* TODO reindent */ - in = ff_bufqueue_peek(&merge->queue_main, 0) ? 1 : 0; - ret = ff_request_frame(ctx->inputs[in]); - if (ret < 0) - return ret; + in = ff_bufqueue_peek(&merge->queue_main, 0) ? 1 : 0; + ret = ff_request_frame(ctx->inputs[in]); + if (ret < 0) + return ret; return 0; } -- cgit v1.2.3