Merge commit '56c2f37727015212a404cae0f444d8bc8704d691'

[ffmpeg] / libavutil / channel_layout.c

diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c
index 4c0677f794f35710e7d104401fb0044847287992..cd5cf426d4f1a901635d977810fe5775bd141ef6 100644 (file)
--- a/libavutil/channel_layout.c
+++ b/libavutil/channel_layout.c
@@ -138,8 +138,8 @@ static uint64_t get_channel_layout_single(const char *name, int name_len)
                        "switch to the syntax '%.*sc' otherwise it will be interpreted as a "
                        "channel layout number in a later version\n",
                        name_len, name, name_len, name);
-                return layout;
             }
+            return layout;
         }
     } else {
 #endif