Merge commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e'

[ffmpeg] / libavfilter / buffersrc.c

diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c
index bb44e45d3c64cd7ceb0a046e22d7ab4a5f4f5591..27d3db085b70c594eb694a85c38cab057cd34308 100644 (file)
--- a/libavfilter/buffersrc.c
+++ b/libavfilter/buffersrc.c
@@ -379,13 +379,13 @@ static av_cold int init_audio(AVFilterContext *ctx)
 
     if (s->channel_layout_str) {
         int n;
-        /* TODO reindent */
-    s->channel_layout = av_get_channel_layout(s->channel_layout_str);
-    if (!s->channel_layout) {
-        av_log(ctx, AV_LOG_ERROR, "Invalid channel layout %s.\n",
-               s->channel_layout_str);
-        return AVERROR(EINVAL);
-    }
+
+        s->channel_layout = av_get_channel_layout(s->channel_layout_str);
+        if (!s->channel_layout) {
+            av_log(ctx, AV_LOG_ERROR, "Invalid channel layout %s.\n",
+                   s->channel_layout_str);
+            return AVERROR(EINVAL);
+        }
         n = av_get_channel_layout_nb_channels(s->channel_layout);
         if (s->channels) {
             if (n != s->channels) {