Call DCT by function pointer. Needed for any future ASM implementation and

allows further cleanup.

Originally committed as revision 22617 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/dct.c b/libavcodec/dct.c
index fbcfeeb1054c9aef1bda775125c2c5ac40c2dd6d..7cc383379b477680eb8538fe30128eb82506b862 100644 (file)
--- a/libavcodec/dct.c
+++ b/libavcodec/dct.c
@@ -105,7 +105,7 @@ static void ff_dct_calc_c(DCTContext *ctx, FFTSample *data)
 
 void ff_dct_calc(DCTContext *s, FFTSample *data)
 {
-    ff_dct_calc_c(s, data);
+    s->dct_calc(s, data);
 }
 
 av_cold int ff_dct_init(DCTContext *s, int nbits, int inverse)
@@ -130,6 +130,8 @@ av_cold int ff_dct_init(DCTContext *s, int nbits, int inverse)
     for (i = 0; i < n/2; i++)
         s->csc2[i] = 0.5 / sin((M_PI / (2*n) * (2*i + 1)));
 
+    s->dct_calc = ff_dct_calc_c;
+
     return 0;
 }
 

diff --git a/libavcodec/fft.h b/libavcodec/fft.h
index 17eb380731983bf2e3553a2b7b417a43f9c5dd9a..df7ded99a83697eea8a79ae734776ed0fbc4e3d5 100644 (file)
--- a/libavcodec/fft.h
+++ b/libavcodec/fft.h
@@ -220,6 +220,7 @@ struct DCTContext {
     RDFTContext rdft;
     const float *costab;
     FFTSample *csc2;
+    void (*dct_calc)(struct DCTContext *s, FFTSample *data);
 };
 
 /**