@@ -43,6 +43,12 @@ const uint8_t ff_ac3_ungroup_3_in_5_bits_tab[32][3] = {

     { 3, 0, 1 }, { 3, 0, 2 }, { 3, 1, 0 }, { 3, 1, 1 }

 };

+/**

+ * Table of bin locations for rematrixing bands

+ * reference: Section 7.5.2 Rematrixing : Frequency Band Definitions

+ */

+const uint8_t ff_ac3_rematrix_band_tab[5] = { 13, 25, 37, 61, 253 };

+

 const uint8_t ff_eac3_hebap_tab[64] = {

     0, 1, 2, 3, 4, 5, 6, 7, 8, 8,

     8, 8, 9, 9, 9, 10, 10, 10, 10, 11,

@@ -1125,9 +1131,3 @@ const uint8_t ff_eac3_frm_expstr[32][6] = {

  */

 const uint8_t ff_eac3_default_cpl_band_struct[18] =

 { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1 };

-

-/**

- * Table of bin locations for rematrixing bands

- * reference: Section 7.5.2 Rematrixing : Frequency Band Definitions

- */

-const uint8_t ff_ac3_rematrix_band_tab[5] = { 13, 25, 37, 61, 253 };

@@ -25,6 +25,8 @@

 #include <stdint.h>

 extern const uint8_t ff_ac3_ungroup_3_in_5_bits_tab[32][3];

+extern const uint8_t ff_ac3_rematrix_band_tab[5];

+

 extern const uint8_t ff_eac3_hebap_tab[64];

 extern const uint8_t ff_eac3_bits_vs_hebap[20];

 extern const int16_t ff_eac3_gaq_remap_1[12];

@@ -35,6 +37,4 @@ extern const int16_t (* const ff_eac3_mantissa_vq[8])[6];

 extern const uint8_t ff_eac3_frm_expstr[32][6];

 extern const uint8_t ff_eac3_default_cpl_band_struct[18];

-extern const uint8_t ff_ac3_rematrix_band_tab[5];

-

 #endif /* AVCODEC_AC3DEC_DATA_H */