eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-12 00:55:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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 83307a32eb)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Simon Thelen
2015-06-09 04:55:57 +02:00
committed by Michael Niedermayer
parent 062f63e46c
commit fb22fc0c46
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavutil/channel_layout.c
View File

@@ -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