add casts to silence gcc warnings

[ffmpeg] / libavcodec / dct-test.c

diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c
index b9c0ff42ec53b351337d3d65e077f7422667706f..9522e1d7f01b200435a7577a450815460a570d73 100644 (file)
--- a/libavcodec/dct-test.c
+++ b/libavcodec/dct-test.c
@@ -102,17 +102,17 @@ struct algo algos[] = {
 #if HAVE_MMX
   {"MMX",             0, ff_fdct_mmx,        ff_ref_fdct, NO_PERM, FF_MM_MMX},
 #if HAVE_MMX2
-  {"MMX2",            0, ff_fdct_mmx2,       ff_ref_fdct, NO_PERM, FF_MM_MMXEXT},
+  {"MMX2",            0, ff_fdct_mmx2,       ff_ref_fdct, NO_PERM, FF_MM_MMX2},
   {"SSE2",            0, ff_fdct_sse2,       ff_ref_fdct, NO_PERM, FF_MM_SSE2},
 #endif
 
 #if CONFIG_GPL
   {"LIBMPEG2-MMX",    1, ff_mmx_idct,        ff_ref_idct, MMX_PERM, FF_MM_MMX},
-  {"LIBMPEG2-MMXEXT", 1, ff_mmxext_idct,     ff_ref_idct, MMX_PERM, FF_MM_MMXEXT},
+  {"LIBMPEG2-MMX2",   1, ff_mmxext_idct,     ff_ref_idct, MMX_PERM, FF_MM_MMX2},
 #endif
   {"SIMPLE-MMX",      1, ff_simple_idct_mmx, ff_ref_idct, MMX_SIMPLE_PERM, FF_MM_MMX},
   {"XVID-MMX",        1, ff_idct_xvid_mmx,   ff_ref_idct, NO_PERM, FF_MM_MMX},
-  {"XVID-MMX2",       1, ff_idct_xvid_mmx2,  ff_ref_idct, NO_PERM, FF_MM_MMXEXT},
+  {"XVID-MMX2",       1, ff_idct_xvid_mmx2,  ff_ref_idct, NO_PERM, FF_MM_MMX2},
   {"XVID-SSE2",       1, ff_idct_xvid_sse2,  ff_ref_idct, SSE2_PERM, FF_MM_SSE2},
 #endif
 
@@ -208,9 +208,9 @@ static void dct_error(const char *name, int is_idct,
     int64_t sysErr[64], sysErrMax=0;
     int maxout=0;
     int blockSumErrMax=0, blockSumErr;
-    AVLFG prn;
+    AVLFG prng;
 
-    av_lfg_init(&prn, 1);
+    av_lfg_init(&prng, 1);
 
     err_inf = 0;
     err2 = 0;
@@ -221,7 +221,7 @@ static void dct_error(const char *name, int is_idct,
         switch(test){
         case 0:
             for(i=0;i<64;i++)
-                block1[i] = (av_lfg_get(&prn) % 512) -256;
+                block1[i] = (av_lfg_get(&prng) % 512) -256;
             if (is_idct){
                 ff_ref_fdct(block1);
 
@@ -230,12 +230,12 @@ static void dct_error(const char *name, int is_idct,
             }
         break;
         case 1:{
-            int num = av_lfg_get(&prn) % 10 + 1;
+            int num = av_lfg_get(&prng) % 10 + 1;
             for(i=0;i<num;i++)
-                block1[av_lfg_get(&prn) % 64] = av_lfg_get(&prn) % 512 -256;
+                block1[av_lfg_get(&prng) % 64] = av_lfg_get(&prng) % 512 -256;
         }break;
         case 2:
-            block1[0] = av_lfg_get(&prn) % 4096 - 2048;
+            block1[0] = av_lfg_get(&prng) % 4096 - 2048;
             block1[63]= (block1[0]&1)^1;
         break;
         }
@@ -335,7 +335,7 @@ static void dct_error(const char *name, int is_idct,
     switch(test){
     case 0:
         for(i=0;i<64;i++)
-            block1[i] = av_lfg_get(&prn) % 512 -256;
+            block1[i] = av_lfg_get(&prng) % 512 -256;
         if (is_idct){
             ff_ref_fdct(block1);
 
@@ -345,10 +345,10 @@ static void dct_error(const char *name, int is_idct,
     break;
     case 1:{
     case 2:
-        block1[0] = av_lfg_get(&prn) % 512 -256;
-        block1[1] = av_lfg_get(&prn) % 512 -256;
-        block1[2] = av_lfg_get(&prn) % 512 -256;
-        block1[3] = av_lfg_get(&prn) % 512 -256;
+        block1[0] = av_lfg_get(&prng) % 512 -256;
+        block1[1] = av_lfg_get(&prng) % 512 -256;
+        block1[2] = av_lfg_get(&prng) % 512 -256;
+        block1[3] = av_lfg_get(&prng) % 512 -256;
     }break;
     }
 
@@ -472,9 +472,9 @@ static void idct248_error(const char *name,
 {
     int it, i, it1, ti, ti1, err_max, v;
 
-    AVLFG prn;
+    AVLFG prng;
 
-    av_lfg_init(&prn, 1);
+    av_lfg_init(&prng, 1);
 
     /* just one test to see if code is correct (precision is less
        important here) */
@@ -483,7 +483,7 @@ static void idct248_error(const char *name,
 
         /* XXX: use forward transform to generate values */
         for(i=0;i<64;i++)
-            block1[i] = av_lfg_get(&prn) % 256 - 128;
+            block1[i] = av_lfg_get(&prng) % 256 - 128;
         block1[0] += 1024;
 
         for(i=0; i<64; i++)