diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-30 03:01:41 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-30 03:09:08 +0200 |
commit | 445fdc014017a236fa7aa2645ffad7e8d0b45bee (patch) | |
tree | 1bd6be8b1dbf95535926c0e1348c63027ecb4339 /libavcodec/ac3tab.h | |
parent | 55ce3c67bb25cd44889f2143ce9fd7dac3ab4a9d (diff) | |
parent | 52fd16a264d1eb14b1a84b7b38041da1756fb216 (diff) | |
download | ffmpeg-445fdc014017a236fa7aa2645ffad7e8d0b45bee.tar.gz |
Merge remote-tracking branch 'newdev/master'
* newdev/master:
ac3enc: move compute_mantissa_size() to ac3dsp
ac3enc: move mant*_cnt and qmant*_ptr out of AC3EncodeContext
Remove support for stripping executables
ac3enc: NEON optimised float_to_fixed24
ac3: move ff_ac3_bit_alloc_calc_bap to ac3dsp
dfa: protect pointer range checks against overflows.
Duplicate: mimic: implement multithreading.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ac3tab.h')
-rw-r--r-- | libavcodec/ac3tab.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/ac3tab.h b/libavcodec/ac3tab.h index 36355d0a86..4bcbcab72b 100644 --- a/libavcodec/ac3tab.h +++ b/libavcodec/ac3tab.h @@ -25,6 +25,12 @@ #include "libavutil/common.h" #include "ac3.h" +#if CONFIG_HARDCODED_TABLES +# define HCONST const +#else +# define HCONST +#endif + extern const uint16_t ff_ac3_frame_size_tab[38][3]; extern const uint8_t ff_ac3_channels_tab[8]; extern const uint16_t ff_ac3_channel_layout_tab[8]; @@ -44,6 +50,8 @@ extern const uint16_t ff_ac3_db_per_bit_tab[4]; extern const int16_t ff_ac3_floor_tab[8]; extern const uint16_t ff_ac3_fast_gain_tab[8]; extern const uint16_t ff_eac3_default_chmap[8]; +extern const uint8_t ff_ac3_band_start_tab[AC3_CRITICAL_BANDS+1]; +extern HCONST uint8_t ff_ac3_bin_to_band_tab[253]; /** Custom channel map locations bitmask * Other channels described in documentation: |