| Index: webrtc/pc/channelmanager.cc
|
| diff --git a/webrtc/pc/channelmanager.cc b/webrtc/pc/channelmanager.cc
|
| index 996a2633f235df6572b78dd3f5e6d7dfe1446f06..f59a3df9c72f7059e0c1a66aed639a66e2dbe518 100644
|
| --- a/webrtc/pc/channelmanager.cc
|
| +++ b/webrtc/pc/channelmanager.cc
|
| @@ -174,7 +174,7 @@ bool ChannelManager::Init() {
|
|
|
| bool ChannelManager::InitMediaEngine_w() {
|
| ASSERT(worker_thread_ == rtc::Thread::Current());
|
| - return (media_engine_->Init(worker_thread_));
|
| + return media_engine_->Init();
|
| }
|
|
|
| void ChannelManager::Terminate() {
|
| @@ -200,7 +200,6 @@ void ChannelManager::Terminate_w() {
|
| while (!voice_channels_.empty()) {
|
| DestroyVoiceChannel_w(voice_channels_.back());
|
| }
|
| - media_engine_->Terminate();
|
| }
|
|
|
| VoiceChannel* ChannelManager::CreateVoiceChannel(
|
|
|