commit 03fe4dfbef715a06f6bafdfd975bf2bdba040cdb
author jmvalin <jmvalin@0101bb08-14d6-0310-b084-bc0e0c8e3800> Tue Apr 23 21:18:37 2002 +0000
committer jmvalin <jmvalin@0101bb08-14d6-0310-b084-bc0e0c8e3800> Tue Apr 23 21:18:37 2002 +0000
tree ecb3222986a03bff47976dd772258f4fd9066214
parent a33358985d5864b1ddd32fbaf25449a8530d23af

Fixed warnings


git-svn-id: http://svn.xiph.org/trunk/speex@3254 0101bb08-14d6-0310-b084-bc0e0c8e3800

libspeex/cb_search.c

diff --git a/libspeex/cb_search.c b/libspeex/cb_search.c
index 23c4ae4..1b89ec1 100644
--- a/libspeex/cb_search.c
+++ b/libspeex/cb_search.c
@@ -575,7 +575,7 @@
       if (i<nb_subvect-1) {
          int best_index2=0;
          float best_score2=-1, best_gain2=0;
-         int nbest, best;
+         int nbest;
          float err[2]={0,0};
          float *tt=PUSH(stack,nsf);
          for (nbest=0;nbest<2;nbest++)

libspeex/sb_celp.c

diff --git a/libspeex/sb_celp.c b/libspeex/sb_celp.c
index 0933001..3ab5614 100644
--- a/libspeex/sb_celp.c
+++ b/libspeex/sb_celp.c
@@ -29,6 +29,7 @@
 #include "cb_search.h"
 #include "quant_lsp.h"
 #include "vq.h"
+#include <string.h>
 
 #ifndef M_PI
 #define M_PI           3.14159265358979323846  /* pi */
@@ -434,7 +435,7 @@
          /* Compute "real excitation" */
          residue_mem(sp, st->interp_qlpc, exc, st->subframeSize, st->lpcSize, st->mem_sp);
          
-#if 0
+#if 1
          /* Compute energy of low-band and high-band excitation */
          for (i=0;i<st->subframeSize;i++)
             eh+=sqr(exc[i]);