[xiph-commits] r19086 - in trunk/theora: examples lib/x86 tests

[tmatth at svn.xiph.org]

Author: tmatth
Date: 2014-02-11 10:39:25 -0800 (Tue, 11 Feb 2014)
New Revision: 19086

Modified:
   trunk/theora/examples/png2theora.c
   trunk/theora/examples/tiff2theora.c
   trunk/theora/lib/x86/x86enc.c
   trunk/theora/tests/granulepos_theora.c
   trunk/theora/tests/noop_theora.c
Log:
theora: fix compiler warnings


Modified: trunk/theora/examples/png2theora.c
===================================================================
--- trunk/theora/examples/png2theora.c	2014-02-11 05:02:28 UTC (rev 19085)
+++ trunk/theora/examples/png2theora.c	2014-02-11 18:39:25 UTC (rev 19086)
@@ -291,14 +291,12 @@
   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;

Modified: trunk/theora/examples/tiff2theora.c
===================================================================
--- trunk/theora/examples/tiff2theora.c	2014-02-11 05:02:28 UTC (rev 19085)
+++ trunk/theora/examples/tiff2theora.c	2014-02-11 18:39:25 UTC (rev 19086)
@@ -291,14 +291,12 @@
   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;

Modified: trunk/theora/lib/x86/x86enc.c
===================================================================
--- trunk/theora/lib/x86/x86enc.c	2014-02-11 05:02:28 UTC (rev 19085)
+++ trunk/theora/lib/x86/x86enc.c	2014-02-11 18:39:25 UTC (rev 19086)
@@ -51,6 +51,8 @@
     _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;

Modified: trunk/theora/tests/granulepos_theora.c
===================================================================
--- trunk/theora/tests/granulepos_theora.c	2014-02-11 05:02:28 UTC (rev 19085)
+++ trunk/theora/tests/granulepos_theora.c	2014-02-11 18:39:25 UTC (rev 19086)
@@ -21,15 +21,6 @@
 
 #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)
 {

Modified: trunk/theora/tests/noop_theora.c
===================================================================
--- trunk/theora/tests/noop_theora.c	2014-02-11 05:02:28 UTC (rev 19085)
+++ trunk/theora/tests/noop_theora.c	2014-02-11 18:39:25 UTC (rev 19086)
@@ -48,6 +48,7 @@
   return 0;
 }
 
+#if 0
 static int
 noop_test_decode ()
 {
@@ -68,6 +69,7 @@
 
   return 0;
 }
+#endif
 
 static int
 noop_test_comments ()