From 5a70097d7940a1e5a6a1a419ca1c55948d3d0e87 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jean-marc.valin@usherbrooke.ca>
Date: Sat, 8 Aug 2009 13:23:03 -0400
Subject: [PATCH] C89 and 16-bit fixes

---
 libcelt/bands.c |  8 ++++++--
 libcelt/celt.c  | 12 ++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/libcelt/bands.c b/libcelt/bands.c
index c767b788..18e8d129 100644
--- a/libcelt/bands.c
+++ b/libcelt/bands.c
@@ -619,7 +619,9 @@ void quant_bands_stereo(const CELTMode *m, celt_norm_t * restrict X, celt_norm_t
       /* If pitch isn't available, use intra-frame prediction */
       if ((eBands[i] >= m->pitchEnd && fold) || (q1+q2)<=0)
       {
-         int K[2] = {q1, q2};
+         int K[2];
+         K[0] = q1;
+         K[1] = q2;
          intra_fold(m, X+C*eBands[i], eBands[i+1]-eBands[i], K, norm, P+C*eBands[i], eBands[i], B);
          deinterleave(P+C*eBands[i], C*N);
       } else if (pitch_used && eBands[i] < m->pitchEnd) {
@@ -890,7 +892,9 @@ void unquant_bands_stereo(const CELTMode *m, celt_norm_t * restrict X, celt_norm
       /* If pitch isn't available, use intra-frame prediction */
       if ((eBands[i] >= m->pitchEnd && fold) || (q1+q2)<=0)
       {
-         int K[2] = {q1, q2};
+         int K[2];
+         K[0] = q1;
+         K[1] = q2;
          intra_fold(m, X+C*eBands[i], eBands[i+1]-eBands[i], K, norm, P+C*eBands[i], eBands[i], B);
          deinterleave(P+C*eBands[i], C*N);
       } else if (pitch_used && eBands[i] < m->pitchEnd) {
diff --git a/libcelt/celt.c b/libcelt/celt.c
index 44386d6d..b31ea2fa 100644
--- a/libcelt/celt.c
+++ b/libcelt/celt.c
@@ -426,13 +426,13 @@ static void compute_inv_mdcts(const CELTMode *mode, int shortBlocks, celt_sig_t
 }
 
 #define FLAG_NONE        0
-#define FLAG_INTRA       1U<<16
-#define FLAG_PITCH       1U<<15
-#define FLAG_SHORT       1U<<14
-#define FLAG_FOLD        1U<<13
+#define FLAG_INTRA       (1U<<13)
+#define FLAG_PITCH       (1U<<12)
+#define FLAG_SHORT       (1U<<11)
+#define FLAG_FOLD        (1U<<10)
 #define FLAG_MASK        (FLAG_INTRA|FLAG_PITCH|FLAG_SHORT|FLAG_FOLD)
 
-celt_int32_t flaglist[8] = {
+int flaglist[8] = {
       0 /*00  */ | FLAG_FOLD,
       1 /*01  */ | FLAG_PITCH|FLAG_FOLD,
       8 /*1000*/ | FLAG_NONE,
@@ -1034,7 +1034,7 @@ int celt_encoder_ctl(CELTEncoder * restrict st, int request, ...)
       break;
       case CELT_SET_VBR_RATE_REQUEST:
       {
-         int value = va_arg(ap, celt_int32_t);
+         celt_int32_t value = va_arg(ap, celt_int32_t);
          if (value<0)
             goto bad_arg;
          if (value>3072000)