(Auto)update libjingle 79205306-> 79244016
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@7633 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/media/webrtc/webrtcvideoengine.cc b/media/webrtc/webrtcvideoengine.cc
index d0ed46d..a0a8d81 100644
--- a/media/webrtc/webrtcvideoengine.cc
+++ b/media/webrtc/webrtcvideoengine.cc
@@ -1661,10 +1661,12 @@
}
WebRtcVideoMediaChannel::~WebRtcVideoMediaChannel() {
- const bool send = false;
- SetSend(send);
- const bool render = false;
- SetRender(render);
+ Terminate();
+}
+
+void WebRtcVideoMediaChannel::Terminate() {
+ SetSend(false);
+ SetRender(false);
while (!send_channels_.empty()) {
if (!DeleteSendChannel(send_channels_.begin()->first)) {
diff --git a/media/webrtc/webrtcvideoengine.h b/media/webrtc/webrtcvideoengine.h
index 2966511..eee82c8 100644
--- a/media/webrtc/webrtcvideoengine.h
+++ b/media/webrtc/webrtcvideoengine.h
@@ -330,6 +330,7 @@
virtual void OnMessage(rtc::Message* msg) OVERRIDE;
protected:
+ void Terminate();
int GetLastEngineError() { return engine()->GetLastEngineError(); }
// webrtc::Transport:
