From 9656ca00900e6c7fce47a48fbe20dfe944c33170 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jean-marc.valin@usherbrooke.ca>
Date: Fri, 11 Apr 2008 17:23:01 +1000
Subject: [PATCH] fixed three declaration-after-statement issues

---
 libcelt/dump_modes.c | 2 +-
 libcelt/modes.c      | 2 +-
 libcelt/rate.c       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libcelt/dump_modes.c b/libcelt/dump_modes.c
index b8d07fb9..eeac8e6e 100644
--- a/libcelt/dump_modes.c
+++ b/libcelt/dump_modes.c
@@ -217,13 +217,13 @@ int main(int argc, char **argv)
 {
    int i, nb;
    FILE *file;
+   CELTMode **m;
    if (argc%4 != 1)
    {
       fprintf (stderr, "must have a multiple of 4 arguments\n");
       return 1;
    }
    nb = (argc-1)/4;
-   CELTMode **m;
    m = malloc(nb*sizeof(CELTMode*));
    for (i=0;i<nb;i++)
    {
diff --git a/libcelt/modes.c b/libcelt/modes.c
index 0f56ae50..cfcd1bec 100644
--- a/libcelt/modes.c
+++ b/libcelt/modes.c
@@ -321,7 +321,6 @@ CELTMode EXPORT *celt_mode_create(celt_int32_t Fs, int channels, int frame_size,
 
 void EXPORT celt_mode_destroy(CELTMode *mode)
 {
-   mdct_clear(&mode->mdct);
 #ifndef STATIC_MODES
    int i;
    const celt_int16_t *prevPtr = NULL;
@@ -346,6 +345,7 @@ void EXPORT celt_mode_destroy(CELTMode *mode)
    mode->marker_end = MODEFREED;
    psydecay_clear(&mode->psy);
 #endif
+   mdct_clear(&mode->mdct);
    celt_free((CELTMode *)mode);
 }
 
diff --git a/libcelt/rate.c b/libcelt/rate.c
index ecfccde9..a1910023 100644
--- a/libcelt/rate.c
+++ b/libcelt/rate.c
@@ -112,10 +112,10 @@ void compute_alloc_cache(CELTMode *m)
       {
          bits[i] = bits[i-1];
       } else {
+         int j;
          VARDECL(celt_uint64_t, u);
          SAVE_STACK;
          ALLOC(u, N, celt_uint64_t);
-         int j;
          /* FIXME: We could save memory here */
          bits[i] = celt_alloc(MAX_PULSES*sizeof(celt_int16_t));
          for (j=0;j<MAX_PULSES;j++)