commit 1af7f9562be00a5ca9a27859e5b66f0c2d056abc
author Pedro Becerra <pbecerr@gmail.com> Thu Jul 11 00:00:47 2013 -0400
committer Jean-Marc Valin <jmvalin@jmvalin.ca> Thu Jul 11 00:02:00 2013 -0400
tree 6c370cd34a7b0caf2a77777b7b69377865e0997f
parent cd373b54de9e5f8b29510f27d522ff303917dba6

Fixes build when DISABLE_FLOAT_API is defined

Signed-off-by: Jean-Marc Valin <jmvalin@jmvalin.ca>

src/opus_multistream_encoder.c

diff --git a/src/opus_multistream_encoder.c b/src/opus_multistream_encoder.c
index 3efab53..6f3eb53 100644
--- a/src/opus_multistream_encoder.c
+++ b/src/opus_multistream_encoder.c
@@ -454,7 +454,9 @@
    unsigned char tmp_data[MS_FRAME_TMP];
    OpusRepacketizer rp;
    opus_int32 complexity;
+#ifndef FIXED_POINT
    AnalysisInfo analysis_info;
+#endif
    const CELTMode *celt_mode;
    opus_int32 bitrates[256];
    opus_val16 bandLogE[42];
@@ -629,27 +631,6 @@
 
 }
 
-#if !defined(DISABLE_FLOAT_API)
-static void opus_copy_channel_in_float(
-  opus_val16 *dst,
-  int dst_stride,
-  const void *src,
-  int src_stride,
-  int src_channel,
-  int frame_size
-)
-{
-   const float *float_src;
-   opus_int32 i;
-   float_src = (const float *)src;
-   for (i=0;i<frame_size;i++)
-#if defined(FIXED_POINT)
-      dst[i*dst_stride] = FLOAT2INT16(float_src[i*src_stride+src_channel]);
-#else
-      dst[i*dst_stride] = float_src[i*src_stride+src_channel];
-#endif
-}
-
 static void channel_pos(int channels, int pos[8])
 {
    /* Position in the mix: 0 don't mix, 1: left, 2: center, 3:right */
@@ -689,6 +670,27 @@
    }
 }
 
+#if !defined(DISABLE_FLOAT_API)
+static void opus_copy_channel_in_float(
+  opus_val16 *dst,
+  int dst_stride,
+  const void *src,
+  int src_stride,
+  int src_channel,
+  int frame_size
+)
+{
+   const float *float_src;
+   opus_int32 i;
+   float_src = (const float *)src;
+   for (i=0;i<frame_size;i++)
+#if defined(FIXED_POINT)
+      dst[i*dst_stride] = FLOAT2INT16(float_src[i*src_stride+src_channel]);
+#else
+      dst[i*dst_stride] = float_src[i*src_stride+src_channel];
+#endif
+}
+
 static void opus_surround_downmix_float(
   opus_val16 *dst,
   const void *src,