diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-16 05:01:24 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-16 05:01:40 +0200 |
commit | fc193793c625afc9af2b7d7d46248f78da7e3a2d (patch) | |
tree | dc97b0b7c2d312e7f6fa557cf8785817ca17dfde /libavcodec/acelp_vectors.c | |
parent | 350f3d145be685768292f751ec4bec8439bf1113 (diff) | |
parent | 033a4a942a81a1880ca5a89e7eb3a2b5f529a7fb (diff) |
Merge remote branch 'qatar/master'
* qatar/master:
aacdec: Use float instead of int16_t for ltp_state to avoid needless rounding.
acelp: Remove unused gray_decode table.
dfa: Remove unused variable.
configure: Include AVX availability in summary output.
configure: use same CPPFLAGS in kFreeBSD as Linux
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/acelp_vectors.c')
-rw-r--r-- | libavcodec/acelp_vectors.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/libavcodec/acelp_vectors.c b/libavcodec/acelp_vectors.c index e41e5facb6..a44ab8cfe6 100644 --- a/libavcodec/acelp_vectors.c +++ b/libavcodec/acelp_vectors.c @@ -93,16 +93,6 @@ const uint8_t ff_fc_4pulses_8bits_track_4[32] = 78, 79, }; -#if 0 -static uint8_t gray_decode[32] = -{ - 0, 1, 3, 2, 7, 6, 4, 5, - 15, 14, 12, 13, 8, 9, 11, 10, - 31, 30, 28, 29, 24, 25, 27, 26, - 16, 17, 19, 18, 23, 22, 20, 21 -}; -#endif - const float ff_pow_0_7[10] = { 0.700000, 0.490000, 0.343000, 0.240100, 0.168070, 0.117649, 0.082354, 0.057648, 0.040354, 0.028248 |