Index: webrtc/modules/audio_coding/acm2/audio_coding_module.cc |
diff --git a/webrtc/modules/audio_coding/acm2/audio_coding_module.cc b/webrtc/modules/audio_coding/acm2/audio_coding_module.cc |
index 4784a8721f8d049bd2628e0f151b0da0f3945b89..73f03a47adc57915f5fc97d01ad3c8e6c05bb809 100644 |
--- a/webrtc/modules/audio_coding/acm2/audio_coding_module.cc |
+++ b/webrtc/modules/audio_coding/acm2/audio_coding_module.cc |
@@ -948,10 +948,8 @@ int AudioCodingModuleImpl::InitializeReceiverSafe() { |
// If the receiver is already initialized then we want to destroy any |
// existing decoders. After a call to this function, we should have a clean |
// start-up. |
- if (receiver_initialized_) { |
- if (receiver_.RemoveAllCodecs() < 0) |
- return -1; |
- } |
+ if (receiver_initialized_) |
hlundin-webrtc
2016/09/19 11:48:02
Oooh, what's our policy on brackets for one-liners
kwiberg-webrtc
2016/09/20 08:10:15
I think our policy is that either are fine if it's
|
+ receiver_.RemoveAllCodecs(); |
receiver_.ResetInitialDelay(); |
receiver_.SetMinimumDelay(0); |
receiver_.SetMaximumDelay(0); |