Fixed a bunch of warnings

This commit is contained in:
Jean-Marc Valin 2008-03-05 08:11:57 +11:00
parent a1bc18a388
commit d9de593104
3 changed files with 6 additions and 6 deletions

View file

@ -512,14 +512,13 @@ void celt_decoder_destroy(CELTDecoder *st)
pitch period */
static void celt_decode_lost(CELTDecoder *st, short *pcm)
{
int i, c, N, B, C, N4;
int i, c, N, B, C;
int pitch_index;
VARDECL(celt_sig_t *freq);
SAVE_STACK;
N = st->block_size;
B = st->nb_blocks;
C = st->mode->nbChannels;
N4 = (N-st->overlap)/2;
ALLOC(freq,C*B*N, celt_sig_t); /**< Interleaved signal MDCTs */
pitch_index = st->last_pitch_index;

View file

@ -216,7 +216,7 @@ static void compute_allocation_table(CELTMode *mode, int res)
CELTMode *celt_mode_create(int Fs, int channels, int frame_size, int lookahead, int *error)
{
int res;
int N, N2, N4, i;
int N, i;
CELTMode *mode;
/* The good thing here is that permutation of the arguments will automatically be invalid */
@ -266,8 +266,6 @@ CELTMode *celt_mode_create(int Fs, int channels, int frame_size, int lookahead,
/*printf ("%d bands\n", mode->nbEBands);*/
N = mode->mdctSize;
N2 = N/2;
N4 = N/4;
mdct_init(&mode->mdct, 2*N);
mode->window = (celt_word16_t*)celt_alloc(mode->overlap*sizeof(celt_word16_t));

View file

@ -69,9 +69,12 @@ static void mix_pitch_and_residual(int *iy, celt_norm_t *X, int N, int K, const
celt_word32_t Ryp, Ryy, Rpp;
celt_word32_t g;
VARDECL(celt_norm_t *y);
#ifdef FIXED_POINT
int yshift;
#endif
SAVE_STACK;
#ifdef FIXED_POINT
int yshift = 14-EC_ILOG(K);
yshift = 14-EC_ILOG(K);
#endif
ALLOC(y, N, celt_norm_t);