Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / avfft.c

diff --git a/libavcodec/avfft.c b/libavcodec/avfft.c
index a278aa94ed8ac86ec1ca4254e37810dfb61d5ec6..9e0ddaa627ab56cfbd6d0743cea1d441106ee9f7 100644 (file)
--- a/libavcodec/avfft.c
+++ b/libavcodec/avfft.c
@@ -19,6 +19,8 @@
 #include "libavutil/mem.h"
 #include "avfft.h"
 #include "fft.h"
+#include "rdft.h"
+#include "dct.h"
 
 /* FFT */
 
@@ -101,7 +103,7 @@ RDFTContext *av_rdft_init(int nbits, enum RDFTransformType trans)
 
 void av_rdft_calc(RDFTContext *s, FFTSample *data)
 {
-    ff_rdft_calc(s, data);
+    s->rdft_calc(s, data);
 }
 
 void av_rdft_end(RDFTContext *s)
@@ -120,7 +122,7 @@ DCTContext *av_dct_init(int nbits, enum DCTTransformType inverse)
 {
     DCTContext *s = av_malloc(sizeof(*s));
 
-    if (s && (ff_dct_init(s, nbits, inverse)))
+    if (s && ff_dct_init(s, nbits, inverse))
         av_freep(&s);
 
     return s;
@@ -128,7 +130,7 @@ DCTContext *av_dct_init(int nbits, enum DCTTransformType inverse)
 
 void av_dct_calc(DCTContext *s, FFTSample *data)
 {
-    ff_dct_calc(s, data);
+    s->dct_calc(s, data);
 }
 
 void av_dct_end(DCTContext *s)