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/aac.h | |
| parent | 350f3d145be685768292f751ec4bec8439bf1113 (diff) | |
| parent | 033a4a942a81a1880ca5a89e7eb3a2b5f529a7fb (diff) | |
| download | ffmpeg-fc193793c625afc9af2b7d7d46248f78da7e3a2d.tar.gz | |
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/aac.h')
| -rw-r--r-- | libavcodec/aac.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aac.h b/libavcodec/aac.h index 5cc85dd613..f089ee9a29 100644 --- a/libavcodec/aac.h +++ b/libavcodec/aac.h @@ -227,7 +227,7 @@ typedef struct { DECLARE_ALIGNED(32, float, coeffs)[1024]; ///< coefficients for IMDCT DECLARE_ALIGNED(32, float, saved)[1024]; ///< overlap DECLARE_ALIGNED(32, float, ret)[2048]; ///< PCM output - DECLARE_ALIGNED(16, int16_t, ltp_state)[3072]; ///< time signal for LTP + DECLARE_ALIGNED(16, float, ltp_state)[3072]; ///< time signal for LTP PredictorState predictor_state[MAX_PREDICTORS]; } SingleChannelElement; |