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 83307a32eb
)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:

committed by
Michael Niedermayer

parent
4348a241ed
commit
b2d7a08405
@@ -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
|
||||
|
Reference in New Issue
Block a user