summaryrefslogtreecommitdiff
path: root/modules/audio_coding/main/acm2/acm_speex.cc
diff options
context:
space:
mode:
authortommi@webrtc.org <tommi@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2014-07-11 19:09:59 +0000
committertommi@webrtc.org <tommi@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2014-07-11 19:09:59 +0000
commit9fbd3ec906560447cebb21681c7e79e37c2eed83 (patch)
tree1da3f4d70b117de6501006316c81943e88e501bf /modules/audio_coding/main/acm2/acm_speex.cc
parent0cb22cf7e4f9531a0f218e27c8ea0d0620cf05d7 (diff)
downloadwebrtc-9fbd3ec906560447cebb21681c7e79e37c2eed83.tar.gz
Landing pkasting's webrtc fixes for MSVC level 4 warnings in WebRTC.
--- Fixes for re-enabling more MSVC level 4 warnings: webrtc/ edition This contains fixes for the following sorts of issues: * Possibly-uninitialized local variable * Signedness mismatch * Assignment inside conditional This also contains a small number of other cleanups to nearby code. In particular several warning-disables for MSVC are removed because they don't seem to be necessary (either that warning is not enabled or the code does not trigger it). BUG=crbug.com/81439 TEST=none R=henrika@webrtc.org, pkasting@chromium.org Review URL: https://webrtc-codereview.appspot.com/18769004 git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6667 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'modules/audio_coding/main/acm2/acm_speex.cc')
-rw-r--r--modules/audio_coding/main/acm2/acm_speex.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/audio_coding/main/acm2/acm_speex.cc b/modules/audio_coding/main/acm2/acm_speex.cc
index 84a0592a..c4d7628d 100644
--- a/modules/audio_coding/main/acm2/acm_speex.cc
+++ b/modules/audio_coding/main/acm2/acm_speex.cc
@@ -30,7 +30,7 @@ ACMSPEEX::ACMSPEEX(int16_t /* codec_id */)
vbr_enabled_(false),
encoding_rate_(-1),
sampling_frequency_(-1),
- samples_in_20ms_audio_(-1) {
+ samples_in_20ms_audio_(0xFFFF) {
return;
}