aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Caldwell <saintdev@gmail.com>2012-01-27 22:23:41 -0700
committerMichael Niedermayer <michaelni@gmx.at>2012-03-16 06:29:10 +0100
commitc00c3807243704e2f7a309143305af85837946de (patch)
treec84408458b47231307b33699012c428fdf5c0252
parent43625c5128af5287e89c81566b48dfd1e6acb499 (diff)
downloadffmpeg-c00c3807243704e2f7a309143305af85837946de.tar.gz
aacenc: Fix LONG_START windowing.
Forgot to add the equivalent amount to the incoming sample pointer as the output pointer. Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit 2e626dd5136f4daa244b37284e22483cdc7df1ac) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/aacenc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c
index e507a34de6..2ff6f9cc04 100644
--- a/libavcodec/aacenc.c
+++ b/libavcodec/aacenc.c
@@ -200,8 +200,8 @@ WINDOW_FUNC(long_start)
float *out = sce->ret;
dsp->vector_fmul(out, audio, lwindow, 1024);
- memcpy(out + 1024, audio, sizeof(out[0]) * 448);
- dsp->vector_fmul_reverse(out + 1024 + 448, audio, swindow, 128);
+ memcpy(out + 1024, audio + 1024, sizeof(out[0]) * 448);
+ dsp->vector_fmul_reverse(out + 1024 + 448, audio + 1024 + 448, swindow, 128);
memset(out + 1024 + 576, 0, sizeof(out[0]) * 448);
}