summaryrefslogtreecommitdiff
path: root/libavfilter/vf_alphamerge.c
diff options
context:
space:
mode:
Diffstat (limited to 'libavfilter/vf_alphamerge.c')
-rw-r--r--libavfilter/vf_alphamerge.c9
1 files changed, 4 insertions, 5 deletions
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;
}