From a22a628356920c6a4cc785bf77077f48d55ee8ac Mon Sep 17 00:00:00 2001
From: "buildbot@webrtc.org" <buildbot@webrtc.org>
Date: Wed, 5 Nov 2014 13:25:48 +0000
Subject: [PATCH] (Auto)update libjingle 79205306-> 79244016

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7633 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 talk/media/webrtc/webrtcvideoengine.cc | 10 ++++++----
 talk/media/webrtc/webrtcvideoengine.h  |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/talk/media/webrtc/webrtcvideoengine.cc b/talk/media/webrtc/webrtcvideoengine.cc
index d0ed46d95d..a0a8d81fb2 100644
--- a/talk/media/webrtc/webrtcvideoengine.cc
+++ b/talk/media/webrtc/webrtcvideoengine.cc
@@ -1661,10 +1661,12 @@ bool WebRtcVideoMediaChannel::Init() {
 }
 
 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/talk/media/webrtc/webrtcvideoengine.h b/talk/media/webrtc/webrtcvideoengine.h
index 2966511c01..eee82c8f73 100644
--- a/talk/media/webrtc/webrtcvideoengine.h
+++ b/talk/media/webrtc/webrtcvideoengine.h
@@ -330,6 +330,7 @@ class WebRtcVideoMediaChannel : public rtc::MessageHandler,
   virtual void OnMessage(rtc::Message* msg) OVERRIDE;
 
  protected:
+  void Terminate();
   int GetLastEngineError() { return engine()->GetLastEngineError(); }
 
   // webrtc::Transport: