diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-07-22 23:33:58 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-07-22 23:33:58 +0000 |
| commit | 7f4e15e2f4da4563de9c30d91bc8bb1e99e8452c (patch) | |
| tree | 1a98a2a1af9608b2020994ef6cafd1f5b976cbad | |
| parent | 84ef7e7fc3339378ec219ffc7cd31e2385c007f8 (diff) | |
| download | ffmpeg-7f4e15e2f4da4563de9c30d91bc8bb1e99e8452c.tar.gz | |
cosmetics: Reorder some tables/lines to make future diffs smaller.
Originally committed as revision 19498 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/ac3dec_data.c | 12 | ||||
| -rw-r--r-- | libavcodec/ac3dec_data.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/ac3dec_data.c b/libavcodec/ac3dec_data.c index aec53af9aa..29d2adde02 100644 --- a/libavcodec/ac3dec_data.c +++ b/libavcodec/ac3dec_data.c @@ -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 }; diff --git a/libavcodec/ac3dec_data.h b/libavcodec/ac3dec_data.h index b3e8711905..76f504cb0a 100644 --- a/libavcodec/ac3dec_data.h +++ b/libavcodec/ac3dec_data.h @@ -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 */ |