diff options
| author | Simon Thelen <ffmpeg-dev@c-14.de> | 2015-06-09 04:55:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-28 02:33:56 +0200 |
| commit | fb22fc0c46bb4bee48cdcdf43c8cb1d18aa04e20 (patch) | |
| tree | e0414c800a8a1dc135daa88de90a518a535c9c37 | |
| parent | 062f63e46cd8d4d8094928ce78566e8fb0830aa5 (diff) | |
| download | ffmpeg-fb22fc0c46bb4bee48cdcdf43c8cb1d18aa04e20.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 |