diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-21 03:09:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-21 03:33:28 +0100 |
| commit | d4a50a2100a2b3539d238e64af98e16f47b47a89 (patch) | |
| tree | 95bc08782f34783dfac34a73142a77adbce4db32 /libavcodec/aacdec.c | |
| parent | 849f80fecbada7c512737e13edec9516541996e3 (diff) | |
| parent | cf752d027fafe691951fa00d9c25e2fda032b536 (diff) | |
| download | ffmpeg-d4a50a2100a2b3539d238e64af98e16f47b47a89.tar.gz | |
Merge remote-tracking branch 'newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacdec.c')
| -rw-r--r-- | libavcodec/aacdec.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 6317e429e2..1399eda126 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -87,6 +87,8 @@ #include "fft.h" #include "fmtconvert.h" #include "lpc.h" +#include "kbdwin.h" +#include "sinewin.h" #include "aac.h" #include "aactab.h" @@ -1750,7 +1752,7 @@ static void windowing_and_mdct_ltp(AACContext *ac, float *out, ac->dsp.vector_fmul_reverse(in + 1024 + 448, in + 1024 + 448, swindow, 128); memset(in + 1024 + 576, 0, 448 * sizeof(float)); } - ff_mdct_calc(&ac->mdct_ltp, out, in); + ac->mdct_ltp.mdct_calc(&ac->mdct_ltp, out, in); } /** @@ -1839,9 +1841,9 @@ static void imdct_and_windowing(AACContext *ac, SingleChannelElement *sce) // imdct if (ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE) { for (i = 0; i < 1024; i += 128) - ff_imdct_half(&ac->mdct_small, buf + i, in + i); + ac->mdct_small.imdct_half(&ac->mdct_small, buf + i, in + i); } else - ff_imdct_half(&ac->mdct, buf, in); + ac->mdct.imdct_half(&ac->mdct, buf, in); /* window overlapping * NOTE: To simplify the overlapping code, all 'meaningless' short to long |