diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-11 22:21:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-11 22:21:38 +0100 |
| commit | 43bf4297e4db95be5901c04ec8e89901c187b01d (patch) | |
| tree | 972027c051776df10076a349d90cd0999db26685 /libavcodec/mpegaudiotab.h | |
| parent | afc660ab9bdfde49be14bcf9ddb38e3688a07511 (diff) | |
| parent | 45ef963908f5ccc63161d4c3479ba8f2a56a7705 (diff) | |
| download | ffmpeg-43bf4297e4db95be5901c04ec8e89901c187b01d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegaudioenc: Move some static tables to MpegAudioContext
Conflicts:
libavcodec/mpegaudioenc.c
libavcodec/mpegaudiotab.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegaudiotab.h')
| -rw-r--r-- | libavcodec/mpegaudiotab.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/libavcodec/mpegaudiotab.h b/libavcodec/mpegaudiotab.h index 35129e646c..42d42d883d 100644 --- a/libavcodec/mpegaudiotab.h +++ b/libavcodec/mpegaudiotab.h @@ -79,20 +79,6 @@ static const int bitinv32[32] = { }; -static int16_t filter_bank[512]; - -static int scale_factor_table[64]; -#ifdef USE_FLOATS -static float scale_factor_inv_table[64]; -#else -static int8_t scale_factor_shift[64]; -static unsigned short scale_factor_mult[64]; -#endif -static unsigned char scale_diff_table[128]; - -/* total number of bits per allocation group */ -static unsigned short total_quant_bits[17]; - /* signal to noise ratio of each quantification step (could be computed from quant_steps[]). The values are dB multiplied by 10 */ |