commit 16ba19a95b520aa20c9815cbb1aebc21e3b77349
author Jean-Marc Valin <jmvalin@jmvalin.ca> Thu Jun 27 03:40:44 2013 -0400
committer Jean-Marc Valin <jmvalin@jmvalin.ca> Thu Jun 27 03:40:44 2013 -0400
tree de5844f952c5f0bfe85b1b7e4c01434ea2a2d091
parent 1975eeadd2bc0f80d60401093f25c167aff21a1f

Fixes MSVC warnings

celt/celt_encoder.c

diff --git a/celt/celt_encoder.c b/celt/celt_encoder.c
index a3439a4..bcaf36a 100644
--- a/celt/celt_encoder.c
+++ b/celt/celt_encoder.c
@@ -1181,7 +1181,7 @@
 
    if (has_surround_mask&&!lfe)
    {
-      opus_int32 surround_target = target + SHR32(MULT16_16(surround_masking,coded_bins<<BITRES), DB_SHIFT);
+      opus_int32 surround_target = target + (opus_int32)SHR32(MULT16_16(surround_masking,coded_bins<<BITRES), DB_SHIFT);
       /*printf("%f %d %d %d %d %d %d ", surround_masking, coded_bins, st->end, st->intensity, surround_target, target, st->bitrate);*/
       target = IMAX(target/4, surround_target);
    }
@@ -1591,7 +1591,7 @@
          /* Compensate for the scaling of short vs long mdcts */
          for (i=0;i<C*nbEBands;i++)
             bandLogE2[i] += HALF16(SHL16(LM, DB_SHIFT));
-         tf_estimate = QCONST16(.2,14);
+         tf_estimate = QCONST16(.2f,14);
       }
    }