Add channel layout support to the AC-3 encoder.

[ffmpeg] / libavcodec / aacdectab.h

diff --git a/libavcodec/aacdectab.h b/libavcodec/aacdectab.h
index 32f1aa47658f50e935a1699f62fedda2ee94735d..34b0abe729501121cb4344fc598f9c5be910abf0 100644 (file)
--- a/libavcodec/aacdectab.h
+++ b/libavcodec/aacdectab.h
@@ -21,7 +21,7 @@
  */
 
 /**
- * @file aacdectab.h
+ * @file libavcodec/aacdectab.h
  * AAC decoder data
  * @author Oded Shimon  ( ods15 ods15 dyndns org )
  * @author Maxim Gavrilov ( maxim.gavrilov gmail com )
@@ -142,7 +142,8 @@ static const uint16_t *swb_offset_1024[] = {
     swb_offset_1024_96, swb_offset_1024_96, swb_offset_1024_64,
     swb_offset_1024_48, swb_offset_1024_48, swb_offset_1024_32,
     swb_offset_1024_24, swb_offset_1024_24, swb_offset_1024_16,
-    swb_offset_1024_16, swb_offset_1024_16, swb_offset_1024_8
+    swb_offset_1024_16, swb_offset_1024_16, swb_offset_1024_8,
+    swb_offset_1024_8
 };
 
 static const uint16_t *swb_offset_128[] = {
@@ -151,7 +152,8 @@ static const uint16_t *swb_offset_128[] = {
     swb_offset_128_96, swb_offset_128_96, swb_offset_128_96,
     swb_offset_128_48, swb_offset_128_48, swb_offset_128_48,
     swb_offset_128_24, swb_offset_128_24, swb_offset_128_16,
-    swb_offset_128_16, swb_offset_128_16, swb_offset_128_8
+    swb_offset_128_16, swb_offset_128_16, swb_offset_128_8,
+    swb_offset_128_8
 };
 
 // @}
@@ -163,11 +165,11 @@ static const uint16_t *swb_offset_128[] = {
  * @{
  */
 static const uint8_t tns_max_bands_1024[] = {
-    31, 31, 34, 40, 42, 51, 46, 46, 42, 42, 42, 39
+    31, 31, 34, 40, 42, 51, 46, 46, 42, 42, 42, 39, 39
 };
 
 static const uint8_t tns_max_bands_128[] = {
-    9, 9, 10, 14, 14, 14, 14, 14, 14, 14, 14, 14
+    9, 9, 10, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14
 };
 // @}
 
@@ -198,7 +200,7 @@ static const float tns_tmp2_map_0_4[16] = {
      0.67369562,  0.52643216,  0.36124167,  0.18374951,
 };
 
-static const float *tns_tmp2_map[4] = {
+static const float * const tns_tmp2_map[4] = {
     tns_tmp2_map_0_3,
     tns_tmp2_map_0_4,
     tns_tmp2_map_1_3,