diff options
author | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-05-01 11:42:41 +0000 |
---|---|---|
committer | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-05-01 11:42:41 +0000 |
commit | e75018ad66658c968b50767847ea1ed5408897ba (patch) | |
tree | 83096f55f8d89521e8938ac355722579abff72df /apps/codecs/libspeex/nb_celp.c | |
parent | 5e57edf2632eb69b0749a9af984fa399a487bec4 (diff) | |
download | rockbox-e75018ad66658c968b50767847ea1ed5408897ba.tar.gz rockbox-e75018ad66658c968b50767847ea1ed5408897ba.zip |
Fix several 'variable set but not used' warnings reported from GCC 4.6.0.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29805 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libspeex/nb_celp.c')
-rw-r--r-- | apps/codecs/libspeex/nb_celp.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/apps/codecs/libspeex/nb_celp.c b/apps/codecs/libspeex/nb_celp.c index 90a5d1e991..98f5e2e240 100644 --- a/apps/codecs/libspeex/nb_celp.c +++ b/apps/codecs/libspeex/nb_celp.c @@ -1001,12 +1001,13 @@ void *nb_decoder_init(const SpeexMode *m) } void nb_decoder_destroy(void *state) -{ +{ +#if !(defined(VAR_ARRAYS) || defined (USE_ALLOCA)) DecState *st; st=(DecState*)state; - -#if !(defined(VAR_ARRAYS) || defined (USE_ALLOCA)) speex_free_scratch(st->stack); +#else + (void)state; #endif /* speex_free (st->excBuf); @@ -1315,7 +1316,6 @@ int nb_decode(void *state, SpeexBits *bits, void *vout) { int offset; spx_word16_t *exc; - spx_word16_t *sp; spx_word16_t *innov_save = NULL; spx_word16_t tmp; @@ -1323,8 +1323,7 @@ int nb_decode(void *state, SpeexBits *bits, void *vout) offset = st->subframeSize*sub; /* Excitation */ exc=st->exc+offset; - /* Original signal */ - sp=out+offset; + if (st->innov_save) innov_save = st->innov_save+offset; @@ -1517,13 +1516,11 @@ int nb_decode(void *state, SpeexBits *bits, void *vout) { int offset; spx_word16_t *sp; - spx_word16_t *exc; + /* Offset relative to start of frame */ offset = st->subframeSize*sub; /* Original signal */ sp=out+offset; - /* Excitation */ - exc=st->exc+offset; /* LSP interpolation (quantized and unquantized) */ lsp_interpolate(st->old_qlsp, qlsp, interp_qlsp, st->lpcSize, sub, st->nbSubframes); |