[FFmpeg-cvslog] lavfi/vf_alphamerge: reindent after last commit.
Nicolas George
git at videolan.org
Wed Oct 7 19:08:36 CEST 2015
ffmpeg | branch: master | Nicolas George <george at nsup.org> | Fri Oct 2 16:12:51 2015 +0200| [d7849248dd0db4fb967188bbefb4d044de85b947] | committer: Nicolas George
lavfi/vf_alphamerge: reindent after last commit.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d7849248dd0db4fb967188bbefb4d044de85b947
---
libavfilter/vf_alphamerge.c | 9 ++++-----
1 file 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;
}
More information about the ffmpeg-cvslog
mailing list