X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fdct.c;h=4dbbff867b083dc91050344280425acbda540e69;hb=530cd2893e020206262a146d567c707ef93baf31;hp=73716d39c973a5e4f153c25e3f30aae8e3257af7;hpb=1d9c2dc89a2302076a68b4a3ae3639abbb1a502d;p=ffmpeg

diff --git a/libavcodec/dct.c b/libavcodec/dct.c
index 73716d39c97..4dbbff867b0 100644
--- a/libavcodec/dct.c
+++ b/libavcodec/dct.c
@@ -40,7 +40,7 @@
 /* cos((M_PI * x / (2 * n)) */
 #define COS(s, n, x) (s->costab[x])
 
-static void ff_dst_calc_I_c(DCTContext *ctx, FFTSample *data)
+static void dst_calc_I_c(DCTContext *ctx, FFTSample *data)
 {
     int n = 1 << ctx->nbits;
     int i;
@@ -70,7 +70,7 @@ static void ff_dst_calc_I_c(DCTContext *ctx, FFTSample *data)
     data[n - 1] = 0;
 }
 
-static void ff_dct_calc_I_c(DCTContext *ctx, FFTSample *data)
+static void dct_calc_I_c(DCTContext *ctx, FFTSample *data)
 {
     int n = 1 << ctx->nbits;
     int i;
@@ -100,7 +100,7 @@ static void ff_dct_calc_I_c(DCTContext *ctx, FFTSample *data)
         data[i] = data[i - 2] - data[i];
 }
 
-static void ff_dct_calc_III_c(DCTContext *ctx, FFTSample *data)
+static void dct_calc_III_c(DCTContext *ctx, FFTSample *data)
 {
     int n = 1 << ctx->nbits;
     int i;
@@ -133,7 +133,7 @@ static void ff_dct_calc_III_c(DCTContext *ctx, FFTSample *data)
     }
 }
 
-static void ff_dct_calc_II_c(DCTContext *ctx, FFTSample *data)
+static void dct_calc_II_c(DCTContext *ctx, FFTSample *data)
 {
     int n = 1 << ctx->nbits;
     int i;
@@ -201,16 +201,16 @@ av_cold int ff_dct_init(DCTContext *s, int nbits, enum DCTTransformType inverse)
             s->csc2[i] = 0.5 / sin((M_PI / (2 * n) * (2 * i + 1)));
 
         switch (inverse) {
-        case DCT_I  : s->dct_calc = ff_dct_calc_I_c;   break;
-        case DCT_II : s->dct_calc = ff_dct_calc_II_c;  break;
-        case DCT_III: s->dct_calc = ff_dct_calc_III_c; break;
-        case DST_I  : s->dct_calc = ff_dst_calc_I_c;   break;
+        case DCT_I  : s->dct_calc = dct_calc_I_c;   break;
+        case DCT_II : s->dct_calc = dct_calc_II_c;  break;
+        case DCT_III: s->dct_calc = dct_calc_III_c; break;
+        case DST_I  : s->dct_calc = dst_calc_I_c;   break;
         }
     }
 
     s->dct32 = ff_dct32_float;
-    if (HAVE_MMX)
-        ff_dct_init_mmx(s);
+    if (ARCH_X86)
+        ff_dct_init_x86(s);
 
     return 0;
 }