(Auto)update libjingle 75875619-> 75878731
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@7235 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/media/webrtc/webrtcvideoengine.cc b/media/webrtc/webrtcvideoengine.cc
index 4261ffb..8d8b36c 100644
--- a/media/webrtc/webrtcvideoengine.cc
+++ b/media/webrtc/webrtcvideoengine.cc
@@ -1612,12 +1612,6 @@
const bool render = false;
SetRender(render);
- if (voice_channel_) {
- WebRtcVoiceMediaChannel* voice_channel =
- static_cast<WebRtcVoiceMediaChannel*>(voice_channel_);
- voice_channel->SetupSharedBandwidthEstimation(NULL, -1);
- }
-
while (!send_channels_.empty()) {
if (!DeleteSendChannel(send_channels_.begin()->first)) {
LOG(LS_ERROR) << "Unable to delete channel with ssrc key "
diff --git a/media/webrtc/webrtcvoiceengine.cc b/media/webrtc/webrtcvoiceengine.cc
index 3d5d9ee..a524bad 100644
--- a/media/webrtc/webrtcvoiceengine.cc
+++ b/media/webrtc/webrtcvoiceengine.cc
@@ -1834,8 +1834,7 @@
WebRtcVoiceMediaChannel::~WebRtcVoiceMediaChannel() {
LOG(LS_VERBOSE) << "WebRtcVoiceMediaChannel::~WebRtcVoiceMediaChannel "
<< voe_channel();
- ASSERT(shared_bwe_vie_ == NULL);
- ASSERT(shared_bwe_vie_channel_ == -1);
+ SetupSharedBandwidthEstimation(NULL, -1);
// Remove any remaining send streams, the default channel will be deleted
// later.
