]> git.sesse.net Git - ffmpeg/commitdiff
lavfi/vf_alphamerge: reindent after last commit.
authorNicolas George <george@nsup.org>
Fri, 2 Oct 2015 14:12:51 +0000 (16:12 +0200)
committerNicolas George <george@nsup.org>
Wed, 7 Oct 2015 17:05:13 +0000 (19:05 +0200)
libavfilter/vf_alphamerge.c

index 3c62b59ad362d033e1a8c6529e429c790b84f7e7..a478de527a887116fd80b10899984f9ade65cc84 100644 (file)
@@ -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;
 }