[FFmpeg-cvslog] libavutil/channel_layout: Correctly return layout when channel specification ends with a trailing ' c'.

[Simon Thelen]

ffmpeg | branch: release/2.2 | Simon Thelen <ffmpeg-dev at c-14.de> | Tue Jun  9 04:55:57 2015 +0200| [b2d7a0840534b54dab3ecb2e0e498505353e8c01] | committer: Michael Niedermayer

libavutil/channel_layout: Correctly return layout when channel specification ends with a trailing 'c'.

Return layout when FF_API_GET_CHANNEL_LAYOUT_COMPAT is set even if the
layout itself is not in the deprecated style.

Signed-off-by: Simon Thelen <ffmpeg-dev at c-14.de>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 83307a32eb0c9f0843f655c44bb65e3e999153f8)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b2d7a0840534b54dab3ecb2e0e498505353e8c01
---

 libavutil/channel_layout.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c
index 4c0677f..cd5cf42 100644
--- 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