diff options
| author | Nicolas George <george@nsup.org> | 2015-10-02 16:12:51 +0200 |
|---|---|---|
| committer | Nicolas George <george@nsup.org> | 2015-10-07 19:05:13 +0200 |
| commit | d7849248dd0db4fb967188bbefb4d044de85b947 (patch) | |
| tree | 542dbccf87f2129009add0052535449cc5c63d22 /libavfilter/vf_alphamerge.c | |
| parent | 35c3043ea4e67f07ada1e45aaf7b5af2c88c352c (diff) | |
| download | ffmpeg-streaming-d7849248dd0db4fb967188bbefb4d044de85b947.zip ffmpeg-streaming-d7849248dd0db4fb967188bbefb4d044de85b947.tar.gz | |
lavfi/vf_alphamerge: reindent after last commit.
Diffstat (limited to 'libavfilter/vf_alphamerge.c')
| -rw-r--r-- | libavfilter/vf_alphamerge.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libavfilter/vf_alphamerge.c b/libavfilter/vf_alphamerge.c index 3c62b59..a478de5 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; } |
