diff options
| author | tommi@webrtc.org <tommi@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-07-11 19:09:59 +0000 |
|---|---|---|
| committer | tommi@webrtc.org <tommi@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-07-11 19:09:59 +0000 |
| commit | 9fbd3ec906560447cebb21681c7e79e37c2eed83 (patch) | |
| tree | 1da3f4d70b117de6501006316c81943e88e501bf /voice_engine/transmit_mixer.cc | |
| parent | 0cb22cf7e4f9531a0f218e27c8ea0d0620cf05d7 (diff) | |
| download | webrtc-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 'voice_engine/transmit_mixer.cc')
| -rw-r--r-- | voice_engine/transmit_mixer.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/voice_engine/transmit_mixer.cc b/voice_engine/transmit_mixer.cc index 76b507f9..2f1c9dc6 100644 --- a/voice_engine/transmit_mixer.cc +++ b/voice_engine/transmit_mixer.cc @@ -1236,7 +1236,7 @@ int32_t TransmitMixer::MixOrReplaceAudioWithFile( // Currently file stream is always mono. // TODO(xians): Change the code when FilePlayer supports real stereo. _audioFrame.UpdateFrame(-1, - -1, + 0xFFFFFFFF, fileBuffer.get(), fileSamples, mixingFrequency, |