--- lib/floor1.c +++ lib/floor1.c @@ -417,7 +417,7 @@ int x0, int x1,lsfit_acc *a, int n,vorbis_info_floor1 *info){ long i; - int quantized=vorbis_dBquant(flr+x0); + /*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; @@ -595,7 +595,7 @@ return (A[pos]+B[pos])>>1; } -static int seq=0; +/*static int seq=0;*/ int *floor1_fit(vorbis_block *vb,vorbis_look_floor1 *look, const float *logmdct, /* in */ @@ -767,7 +767,7 @@ long i,j; vorbis_info_floor1 *info=look->vi; - long n=look->n; + /*long n=look->n;*/ long posts=look->posts; codec_setup_info *ci=vb->vd->vi->codec_setup; int out[VIF_POSIT+2]; --- lib/mapping0.c +++ lib/mapping0.c @@ -623,8 +623,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, @@ -783,7 +783,7 @@ 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 hs=ci->halfrate_flag; */ int i,j; long n=vb->pcmend=ci->blocksizes[vb->W]; --- lib/res0.c +++ lib/res0.c @@ -372,7 +372,7 @@ 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; + /*codec_setup_info *ci=vi->codec_setup;*/ /* move all this setup out later */ int samples_per_partition=info->grouping; @@ -500,7 +500,7 @@ vorbis_look_residue0 *look=(vorbis_look_residue0 *)vl; vorbis_info_residue0 *info=look->info; - vorbis_dsp_state *vd=vb->vd; + /*vorbis_dsp_state *vd=vb->vd;*/ /* move all this setup out later */ int samples_per_partition=info->grouping; --- lib/scales.h +++ lib/scales.h @@ -25,7 +25,7 @@ #define VORBIS_IEEE_FLOAT32 1 #ifdef VORBIS_IEEE_FLOAT32 -static float unitnorm(float x){ +static inline float unitnorm(float x){ union { ogg_uint32_t i; float f; @@ -36,7 +36,7 @@ } /* Segher was off (too high) by ~ .3 decibel. Center the conversion correctly. */ -static float todB(const float *x){ +static inline float todB(const float *x){ union { ogg_uint32_t i; float f; @@ -50,7 +50,7 @@ #else -static float unitnorm(float x){ +static inline float unitnorm(float x){ if(x<0)return(-1.f); return(1.f); }