diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-23 10:02:43 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-23 10:02:43 +0200 |
commit | fdb48225592c593892ffbe799847ff0867253d2a (patch) | |
tree | ba0f9eb21885ef1f70670efe113c6c2f71882e0a /libavcodec/aac.h | |
parent | e0f291822306b544366faf408df4661c7acc300e (diff) | |
parent | b3be41ca82529d60f90107d4e0d5b59daab00920 (diff) | |
download | ffmpeg-fdb48225592c593892ffbe799847ff0867253d2a.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aac: Add support for Enhanced AAC Low Delay (ER AAC ELD).
Conflicts:
Changelog
libavcodec/aacdec.c
libavcodec/version.h
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 cda14777c4..89f463e341 100644 --- a/libavcodec/aac.h +++ b/libavcodec/aac.h @@ -234,7 +234,7 @@ typedef struct SingleChannelElement { int sf_idx[128]; ///< scalefactor indices (used by encoder) uint8_t zeroes[128]; ///< band is not coded (used by encoder) DECLARE_ALIGNED(32, float, coeffs)[1024]; ///< coefficients for IMDCT - DECLARE_ALIGNED(32, float, saved)[1024]; ///< overlap + DECLARE_ALIGNED(32, float, saved)[1536]; ///< overlap DECLARE_ALIGNED(32, float, ret_buf)[2048]; ///< PCM output buffer DECLARE_ALIGNED(16, float, ltp_state)[3072]; ///< time signal for LTP PredictorState predictor_state[MAX_PREDICTORS]; |