virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/aacdectab: Remove empty channel layouts

Browse Source 
They will be mistaken for the sentinel of the arrays
they are in, thereby hiding the 6.1, 7.1 and 22.2 layouts.
(This doesn't really matter, as these arrays are informational
only for decoders.)

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2022-09-26 02:14:45 +02:00
parent fdff1b9cbf
commit 6573e65ac0
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/aacdectab.h
View File

@@ -73,7 +73,7 @@ static const uint8_t aac_channel_layout_map[16][16][3] = {
}; };
#if FF_API_OLD_CHANNEL_LAYOUT #if FF_API_OLD_CHANNEL_LAYOUT
static const uint64_t aac_channel_layout[16] = { static const uint64_t aac_channel_layout[] = {
AV_CH_LAYOUT_MONO, AV_CH_LAYOUT_MONO,
AV_CH_LAYOUT_STEREO, AV_CH_LAYOUT_STEREO,
AV_CH_LAYOUT_SURROUND, AV_CH_LAYOUT_SURROUND,
@@ -81,9 +81,6 @@ static const uint64_t aac_channel_layout[16] = {
AV_CH_LAYOUT_5POINT0_BACK, AV_CH_LAYOUT_5POINT0_BACK,
AV_CH_LAYOUT_5POINT1_BACK, AV_CH_LAYOUT_5POINT1_BACK,
AV_CH_LAYOUT_7POINT1_WIDE_BACK, AV_CH_LAYOUT_7POINT1_WIDE_BACK,
0,
0,
0,
AV_CH_LAYOUT_6POINT1, AV_CH_LAYOUT_6POINT1,
AV_CH_LAYOUT_7POINT1, AV_CH_LAYOUT_7POINT1,
AV_CH_LAYOUT_22POINT2, AV_CH_LAYOUT_22POINT2,
@@ -92,7 +89,7 @@ static const uint64_t aac_channel_layout[16] = {
}; };
#endif #endif
static const AVChannelLayout aac_ch_layout[16] = { static const AVChannelLayout aac_ch_layout[] = {
AV_CHANNEL_LAYOUT_MONO, AV_CHANNEL_LAYOUT_MONO,
AV_CHANNEL_LAYOUT_STEREO, AV_CHANNEL_LAYOUT_STEREO,
AV_CHANNEL_LAYOUT_SURROUND, AV_CHANNEL_LAYOUT_SURROUND,
@@ -100,9 +97,6 @@ static const AVChannelLayout aac_ch_layout[16] = {
AV_CHANNEL_LAYOUT_5POINT0_BACK, AV_CHANNEL_LAYOUT_5POINT0_BACK,
AV_CHANNEL_LAYOUT_5POINT1_BACK, AV_CHANNEL_LAYOUT_5POINT1_BACK,
AV_CHANNEL_LAYOUT_7POINT1_WIDE_BACK, AV_CHANNEL_LAYOUT_7POINT1_WIDE_BACK,
{ 0 },
{ 0 },
{ 0 },
AV_CHANNEL_LAYOUT_6POINT1, AV_CHANNEL_LAYOUT_6POINT1,
AV_CHANNEL_LAYOUT_7POINT1, AV_CHANNEL_LAYOUT_7POINT1,
AV_CHANNEL_LAYOUT_22POINT2, AV_CHANNEL_LAYOUT_22POINT2,