summaryrefslogtreecommitdiff
path: root/libavcodec/aacdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-04 13:40:20 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-04 13:40:23 +0100
commitdd72e26d0cea78093324bdc5c0088aa53f2983a2 (patch)
tree71f1e9d4241e9a38ca86bea4c362dbd7978da5ef /libavcodec/aacdec.c
parentf53aa3f4f331d845b76c336405435b76dc7204f9 (diff)
parent7640c4a371a97899dfb443d980fd0bf8ac587754 (diff)
Merge commit '7640c4a371a97899dfb443d980fd0bf8ac587754'
* commit '7640c4a371a97899dfb443d980fd0bf8ac587754': aacdec: Tables for length 480 AAC ELD. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacdec.c')
-rw-r--r--libavcodec/aacdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 6a5a5d0074..52c01a52fc 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -2586,7 +2586,7 @@ static void imdct_and_windowing_eld(AACContext *ac, SingleChannelElement *sce)
float *in = sce->coeffs;
float *out = sce->ret;
float *saved = sce->saved;
- const float *const window = ff_aac_eld_window;
+ const float *const window = ff_aac_eld_window_512;
float *buf = ac->buf_mdct;
int i;
const int n = 512;