theora: fix compiler warnings
authorTristan Matthews <le.businessman@gmail.com>
Tue, 11 Feb 2014 18:39:25 +0000 (18:39 +0000)
committerTristan Matthews <le.businessman@gmail.com>
Tue, 11 Feb 2014 18:39:25 +0000 (18:39 +0000)
svn path=/trunk/theora/; revision=19086

examples/png2theora.c
examples/tiff2theora.c
lib/x86/x86enc.c
tests/granulepos_theora.c
tests/noop_theora.c

index 89bc0eb..94a9ab9 100644 (file)
@@ -291,14 +291,12 @@ rgb_to_yuv(png_bytep *png,
   unsigned int y1;
 
   unsigned long yuv_w;
-  unsigned long yuv_h;
 
   unsigned char *yuv_y;
   unsigned char *yuv_u;
   unsigned char *yuv_v;
 
   yuv_w = ycbcr[0].width;
-  yuv_h = ycbcr[0].height;
 
   yuv_y = ycbcr[0].data;
   yuv_u = ycbcr[1].data;
index 37fd9d5..0297884 100644 (file)
@@ -291,14 +291,12 @@ rgb_to_yuv(uint32 *raster,
   unsigned int y1;
 
   unsigned long yuv_w;
-  unsigned long yuv_h;
 
   unsigned char *yuv_y;
   unsigned char *yuv_u;
   unsigned char *yuv_v;
 
   yuv_w = ycbcr[0].width;
-  yuv_h = ycbcr[0].height;
 
   yuv_y = ycbcr[0].data;
   yuv_u = ycbcr[1].data;
index c991b93..ffa9c14 100644 (file)
@@ -51,6 +51,8 @@ void oc_enc_accel_init_x86(oc_enc_ctx *_enc){
     _enc->opt_vtable.enquant_table_init=oc_enc_enquant_table_init_x86;
     _enc->opt_vtable.enquant_table_fixup=oc_enc_enquant_table_fixup_x86;
     _enc->opt_vtable.quantize=oc_enc_quantize_sse2;
+# else
+    (void) cpu_flags;
 # endif
     _enc->opt_data.enquant_table_size=128*sizeof(ogg_uint16_t);
     _enc->opt_data.enquant_table_alignment=16;
index 1297f8a..ddc81f9 100644 (file)
 
 #include "tests.h"
 
-static int ilog(unsigned int v){
-  int ret=0;
-  while(v){
-    ret++;
-    v>>=1;
-  }
-  return(ret);
-}
-
 static int
 granulepos_test_encode (int frequency, int auto_p)
 {
index bdc1d33..60a2970 100644 (file)
@@ -48,6 +48,7 @@ noop_test_encode ()
   return 0;
 }
 
+#if 0
 static int
 noop_test_decode ()
 {
@@ -68,6 +69,7 @@ noop_test_decode ()
 
   return 0;
 }
+#endif
 
 static int
 noop_test_comments ()