diff options
| author | Simon Thelen <ffmpeg-dev@c-14.de> | 2015-06-09 04:55:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-09 22:56:52 +0200 |
| commit | b2d7a0840534b54dab3ecb2e0e498505353e8c01 (patch) | |
| tree | 3ba2593c51f107ccf24a47acb3b0e9444928a104 | |
| parent | 4348a241ed535fe1141e4acfb3ad799b0302a8d2 (diff) | |
| download | ffmpeg-b2d7a0840534b54dab3ecb2e0e498505353e8c01.tar.gz | |
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@c-14.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 83307a32eb0c9f0843f655c44bb65e3e999153f8)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/channel_layout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c index 4c0677f794..cd5cf426d4 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 |