aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/imc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-03-21 03:09:46 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-03-21 03:33:28 +0100
commitd4a50a2100a2b3539d238e64af98e16f47b47a89 (patch)
tree95bc08782f34783dfac34a73142a77adbce4db32 /libavcodec/imc.c
parent849f80fecbada7c512737e13edec9516541996e3 (diff)
parentcf752d027fafe691951fa00d9c25e2fda032b536 (diff)
downloadffmpeg-d4a50a2100a2b3539d238e64af98e16f47b47a89.tar.gz
Merge remote-tracking branch 'newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/imc.c')
-rw-r--r--libavcodec/imc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/imc.c b/libavcodec/imc.c
index 4cbb287a57..cb0c7102d8 100644
--- a/libavcodec/imc.c
+++ b/libavcodec/imc.c
@@ -41,6 +41,7 @@
#include "dsputil.h"
#include "fft.h"
#include "libavutil/audioconvert.h"
+#include "sinewin.h"
#include "imcdata.h"
@@ -564,8 +565,8 @@ static void imc_imdct256(IMCContext *q) {
}
/* FFT */
- ff_fft_permute(&q->fft, q->samples);
- ff_fft_calc (&q->fft, q->samples);
+ q->fft.fft_permute(&q->fft, q->samples);
+ q->fft.fft_calc (&q->fft, q->samples);
/* postrotation, window and reorder */
for(i = 0; i < COEFFS/2; i++){