[xiph-commits] r13578 - trunk/vorbis/lib

[erikd at svn.xiph.org]

Author: erikd
Date: 2007-08-20 03:44:04 -0700 (Mon, 20 Aug 2007)
New Revision: 13578

Modified:
   trunk/vorbis/lib/floor1.c
   trunk/vorbis/lib/mapping0.c
   trunk/vorbis/lib/psy.c
   trunk/vorbis/lib/res0.c
Log:
Remove warnings about unused or uninitialized variables.

Modified: trunk/vorbis/lib/floor1.c
===================================================================
--- trunk/vorbis/lib/floor1.c	2007-08-20 10:04:37 UTC (rev 13577)
+++ trunk/vorbis/lib/floor1.c	2007-08-20 10:44:04 UTC (rev 13578)
@@ -399,7 +399,6 @@
 			  int x0, int x1,lsfit_acc *a,
 			  int n,vorbis_info_floor1 *info){
   long i;
-  int quantized=vorbis_dBquant(flr+x0);
 
   long xa=0,ya=0,x2a=0,y2a=0,xya=0,na=0, xb=0,yb=0,x2b=0,y2b=0,xyb=0,nb=0;
 
@@ -577,8 +576,6 @@
   return (A[pos]+B[pos])>>1;
 }
 
-static int seq=0;
-
 int *floor1_fit(vorbis_block *vb,vorbis_look_floor1 *look,
 			  const float *logmdct,   /* in */
 			  const float *logmask){
@@ -749,7 +746,6 @@
 
   long i,j;
   vorbis_info_floor1 *info=look->vi;
-  long n=look->n;
   long posts=look->posts;
   codec_setup_info *ci=vb->vd->vi->codec_setup;
   int out[VIF_POSIT+2];

Modified: trunk/vorbis/lib/mapping0.c
===================================================================
--- trunk/vorbis/lib/mapping0.c	2007-08-20 10:04:37 UTC (rev 13577)
+++ trunk/vorbis/lib/mapping0.c	2007-08-20 10:44:04 UTC (rev 13578)
@@ -576,8 +576,8 @@
     float **couple_bundle=alloca(sizeof(*couple_bundle)*vi->channels);
     int *zerobundle=alloca(sizeof(*zerobundle)*vi->channels);
     int **sortindex=alloca(sizeof(*sortindex)*vi->channels);
-    float **mag_memo;
-    int **mag_sort;
+    float **mag_memo=NULL;
+    int **mag_sort=NULL;
 
     if(info->coupling_steps){
       mag_memo=_vp_quantize_couple_memo(vb,
@@ -725,7 +725,6 @@
   codec_setup_info     *ci=vi->codec_setup;
   private_state        *b=vd->backend_state;
   vorbis_info_mapping0 *info=(vorbis_info_mapping0 *)l;
-  int hs=ci->halfrate_flag; 
 
   int                   i,j;
   long                  n=vb->pcmend=ci->blocksizes[vb->W];

Modified: trunk/vorbis/lib/psy.c
===================================================================
--- trunk/vorbis/lib/psy.c	2007-08-20 10:04:37 UTC (rev 13577)
+++ trunk/vorbis/lib/psy.c	2007-08-20 10:44:04 UTC (rev 13578)
@@ -1217,7 +1217,6 @@
  
   int i,j,n=p->n, de=0.3*p->m_val;
   int limit=g->coupling_pointlimit[p->vi->blockflag][PACKETBLOBS/2];
-  int start=p->vi->normal_start;
   
   for(i=0; i<vi->coupling_steps; i++){
     /* for(j=start; j<limit; j++){} // ???*/

Modified: trunk/vorbis/lib/res0.c
===================================================================
--- trunk/vorbis/lib/res0.c	2007-08-20 10:04:37 UTC (rev 13577)
+++ trunk/vorbis/lib/res0.c	2007-08-20 10:44:04 UTC (rev 13578)
@@ -372,7 +372,6 @@
   vorbis_look_residue0 *look=(vorbis_look_residue0 *)vl;
   vorbis_info_residue0 *info=look->info;
   vorbis_info           *vi=vb->vd->vi;
-  codec_setup_info      *ci=vi->codec_setup;
 
   /* move all this setup out later */
   int samples_per_partition=info->grouping;