| Index: talk/session/media/channelmanager.cc
|
| diff --git a/talk/session/media/channelmanager.cc b/talk/session/media/channelmanager.cc
|
| index 5930dfd75aa3af16db2fc74fbcd3e52bf8442da4..91d0b99e415343dfb25c2a3c0ec85b219800ffd6 100644
|
| --- a/talk/session/media/channelmanager.cc
|
| +++ b/talk/session/media/channelmanager.cc
|
| @@ -283,9 +283,9 @@ VoiceChannel* ChannelManager::CreateVoiceChannel_w(
|
| if (!media_channel)
|
| return nullptr;
|
|
|
| - VoiceChannel* voice_channel =
|
| - new VoiceChannel(worker_thread_, media_engine_.get(), media_channel,
|
| - transport_controller, content_name, rtcp);
|
| + VoiceChannel* voice_channel = new VoiceChannel(
|
| + worker_thread_, media_engine_.get(), media_channel, media_controller,
|
| + transport_controller, content_name, rtcp);
|
| if (!voice_channel->Init()) {
|
| delete voice_channel;
|
| return nullptr;
|
| @@ -340,8 +340,9 @@ VideoChannel* ChannelManager::CreateVideoChannel_w(
|
| return NULL;
|
| }
|
|
|
| - VideoChannel* video_channel = new VideoChannel(
|
| - worker_thread_, media_channel, transport_controller, content_name, rtcp);
|
| + VideoChannel* video_channel =
|
| + new VideoChannel(worker_thread_, media_channel, media_controller,
|
| + transport_controller, content_name, rtcp);
|
| if (!video_channel->Init()) {
|
| delete video_channel;
|
| return NULL;
|
|
|