avcodec: remove duplicate AVCodecIDs

[ffmpeg] / libavcodec / aacenctab.h

diff --git a/libavcodec/aacenctab.h b/libavcodec/aacenctab.h
index 25c523ee40a909ea48c51bee503e58d6163a789e..9e7595a755d14a48075af434696923fa054f98bd 100644 (file)
--- a/libavcodec/aacenctab.h
+++ b/libavcodec/aacenctab.h
@@ -38,10 +38,10 @@
 
 #define AAC_MAX_CHANNELS 6
 
-extern const uint8_t *swb_size_1024[];
-extern const int      swb_size_1024_len;
-extern const uint8_t *swb_size_128[];
-extern const int      swb_size_128_len;
+extern const uint8_t *ff_aac_swb_size_1024[];
+extern const int      ff_aac_swb_size_1024_len;
+extern const uint8_t *ff_aac_swb_size_128[];
+extern const int      ff_aac_swb_size_128_len;
 
 /** default channel configurations */
 static const uint8_t aac_chan_configs[6][5] = {
@@ -85,6 +85,19 @@ static const uint8_t run_value_bits_short[16] = {
     3, 3, 3, 3, 3, 3, 3, 6, 6, 6, 6, 6, 6, 6, 6, 9
 };
 
+/* TNS starting SFBs for long and short windows */
+static const uint8_t tns_min_sfb_short[16] = {
+    2, 2, 2, 3, 3, 4, 6, 6, 8, 10, 10, 12, 12, 12, 12, 12
+};
+
+static const uint8_t tns_min_sfb_long[16] = {
+    12, 13, 15, 16, 17, 20, 25, 26, 24, 28, 30, 31, 31, 31, 31, 31
+};
+
+static const uint8_t * const tns_min_sfb[2] = {
+    tns_min_sfb_long, tns_min_sfb_short
+};
+
 static const uint8_t * const run_value_bits[2] = {
     run_value_bits_long, run_value_bits_short
 };