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/aacdec.c | |
| 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/aacdec.c')
| -rw-r--r-- | libavcodec/aacdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 48c0367b06..61e33656c7 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -1825,9 +1825,9 @@ static void update_ltp(AACContext *ac, SingleChannelElement *sce) saved_ltp[i + 512] = ac->buf_mdct[1023 - i] * lwindow[511 - i]; } - memcpy(sce->ltp_state, &sce->ltp_state[1024], 1024 * sizeof(int16_t)); - ac->fmt_conv.float_to_int16(&(sce->ltp_state[1024]), sce->ret, 1024); - ac->fmt_conv.float_to_int16(&(sce->ltp_state[2048]), saved_ltp, 1024); + memcpy(sce->ltp_state, sce->ltp_state+1024, 1024 * sizeof(*sce->ltp_state)); + memcpy(sce->ltp_state+1024, sce->ret, 1024 * sizeof(*sce->ltp_state)); + memcpy(sce->ltp_state+2048, saved_ltp, 1024 * sizeof(*sce->ltp_state)); } /** |