[Gnash-commit] /srv/bzr/gnash/trunk r10644: Fix when we don't use Speex resampling

[Markus Gothe]

------------------------------------------------------------
revno: 10644
committer: Markus Gothe <address@hidden>
branch nick: trunk
timestamp: Mon 2009-03-02 02:03:41 +0100
message:
  Fix when we don't use Speex resampling
modified:
  libmedia/AudioDecoderSpeex.cpp

=== modified file 'libmedia/AudioDecoderSpeex.cpp'
--- a/libmedia/AudioDecoderSpeex.cpp    2009-02-26 15:40:13 +0000
+++ b/libmedia/AudioDecoderSpeex.cpp    2009-03-02 01:03:41 +0000
@@ -111,10 +111,11 @@
             break;
         }
 
-        spx_uint32_t conv_size = 0;
+        
         boost::int16_t* conv_data = 0;
 
 #ifdef RESAMPLING_SPEEX
+               spx_uint32_t conv_size = 0;
         conv_data = new boost::int16_t[_target_frame_size];
         memset(conv_data, 0, _target_frame_size * 2);
 
@@ -149,7 +150,7 @@
             _speex_framesize /* sample count*/, 2 /* sample size */,
             16000, false /* stereo */, 44100 /* new rate */,
             true /* convert to stereo */);
-        conv_size = outsize;
+        boost::int16_t conv_size = outsize;
 #endif
         total_size += conv_size;