summaryrefslogtreecommitdiff
path: root/libavcodec/aacdectab.h
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2022-10-26 20:11:04 -0300
committerJames Almer <jamrial@gmail.com>2022-11-04 09:04:41 -0300
commitc351fdc0c6bd1a6d7b0d66374607cc64ca6554df (patch)
treeffd6dc77e51b23e7194e441927155027351822c1 /libavcodec/aacdectab.h
parent1a8defb281ac2d1d04ee1e96e667861cd005dd2d (diff)
downloadffmpeg-c351fdc0c6bd1a6d7b0d66374607cc64ca6554df.tar.gz
avcodec/aacdec: fix parsing streams with channel configuration 11
Set the correct amount of tags in tags_per_config[]. Also, there are no channels that correspond to a side element in this configuration, so reflect this in the list of known/supported channel layouts. Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit 8c7d3b43cc1e41de62733eb90dda7e061778f390)
Diffstat (limited to 'libavcodec/aacdectab.h')
-rw-r--r--libavcodec/aacdectab.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/aacdectab.h b/libavcodec/aacdectab.h
index c54a3eb943..14851b23e2 100644
--- a/libavcodec/aacdectab.h
+++ b/libavcodec/aacdectab.h
@@ -35,7 +35,7 @@
#include <stdint.h>
-static const int8_t tags_per_config[16] = { 0, 1, 1, 2, 3, 3, 4, 5, 0, 0, 0, 4, 5, 16, 5, 0 };
+static const int8_t tags_per_config[16] = { 0, 1, 1, 2, 3, 3, 4, 5, 0, 0, 0, 5, 5, 16, 5, 0 };
static const uint8_t aac_channel_layout_map[16][16][3] = {
{ { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, },
@@ -83,7 +83,7 @@ static const uint64_t aac_channel_layout[16] = {
0,
0,
0,
- AV_CH_LAYOUT_6POINT1,
+ AV_CH_LAYOUT_6POINT1_BACK,
AV_CH_LAYOUT_7POINT1,
AV_CH_LAYOUT_22POINT2,
0,