avcodec/aac{enc,}tab: Deduplicate swb tables

Signed-off-by: Andreas Rheinhardt <[email protected]>

Author: mkver

libavcodec/aacenctab.c

@@ -25,9 +25,7 @@ static const uint8_t swb_size_128_96[] = {
     4, 4, 4, 4, 4, 4, 8, 8, 8, 16, 28, 36
 };
 
-static const uint8_t swb_size_128_64[] = {
-    4, 4, 4, 4, 4, 4, 8, 8, 8, 16, 28, 36
-};
+#define swb_size_128_64 swb_size_128_96
 
 static const uint8_t swb_size_128_48[] = {
     4, 4, 4, 4, 4, 8, 8, 8, 12, 12, 12, 16, 16, 16

libavcodec/aactab.c

@@ -170,10 +170,6 @@ const uint8_t ff_aac_num_swb_128[] = {
     12, 12, 12, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15
 };
 
-const uint8_t ff_aac_num_swb_120[] = {
-    12, 12, 12, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15
-};
-
 const uint8_t ff_aac_num_swb_96[] = {
     12, 12, 12, 12, 12, 12, 14, 14, 14, 14, 14, 14, 14
 };
@@ -1838,13 +1834,7 @@ static const uint16_t swb_offset_768_48[] =
     544, 576, 608, 640, 672, 704, 736, 768
 };
 
-static const uint16_t swb_offset_768_32[] =
-{
-    0,   4,   8,   12,  16,  20,  24,  28,  32,  36,  40,  48,
-    56,  64,  72,  80,  88,  96,  108, 120, 132, 144, 160, 176,
-    196, 216, 240, 264, 292, 320, 352, 384, 416, 448, 480, 512,
-    544, 576, 608, 640, 672, 704, 736, 768
-};
+#define swb_offset_768_32 swb_offset_768_48
 
 static const uint16_t swb_offset_768_24[] =
 {

libavcodec/aactab.h

@@ -76,7 +76,7 @@ extern const uint8_t ff_aac_num_swb_768 [];
 extern const uint8_t ff_aac_num_swb_512 [];
 extern const uint8_t ff_aac_num_swb_480 [];
 extern const uint8_t ff_aac_num_swb_128 [];
-extern const uint8_t ff_aac_num_swb_120 [];
+#define ff_aac_num_swb_120 ff_aac_num_swb_128
 extern const uint8_t ff_aac_num_swb_96  [];
 // @}