diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-07-16 14:53:18 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-07-16 14:53:18 +0000 |
| commit | f3d27028ce9a280c02c286f9b98adf1e476c03d2 (patch) | |
| tree | dca7e434477e7454b81894977f75e455af4cc0dc /modules/audio_coding/main/acm2/acm_generic_codec.cc | |
| parent | 477e6bce6816b8bb433c2e6c44b377bdc766a3b3 (diff) | |
| parent | 82383d9b14ff8e5fedf5a70229eb0ac6b512909a (diff) | |
| download | webrtc-f3d27028ce9a280c02c286f9b98adf1e476c03d2.tar.gz | |
Merge third_party/webrtc from https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git at 82383d9b14ff8e5fedf5a70229eb0ac6b512909a
This commit was generated by merge_from_chromium.py.
Change-Id: I8c578be801fa38420e875a4a8cef17e7522252e2
Diffstat (limited to 'modules/audio_coding/main/acm2/acm_generic_codec.cc')
| -rw-r--r-- | modules/audio_coding/main/acm2/acm_generic_codec.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/audio_coding/main/acm2/acm_generic_codec.cc b/modules/audio_coding/main/acm2/acm_generic_codec.cc index d16d1d38..db776d2e 100644 --- a/modules/audio_coding/main/acm2/acm_generic_codec.cc +++ b/modules/audio_coding/main/acm2/acm_generic_codec.cc @@ -838,7 +838,7 @@ int16_t ACMGenericCodec::ProcessFrameVADDTX(uint8_t* bitstream, // Calculate number of samples in 10 ms blocks, and number ms in one frame. int16_t samples_in_10ms = static_cast<int16_t>(freq_hz / 100); int32_t frame_len_ms = static_cast<int32_t>(frame_len_smpl_) * 1000 / freq_hz; - int16_t status; + int16_t status = -1; // Vector for storing maximum 30 ms of mono audio at 48 kHz. int16_t audio[1440]; |