Index: talk/session/media/channelmanager.cc |
diff --git a/talk/session/media/channelmanager.cc b/talk/session/media/channelmanager.cc |
index 115f3b4ea226967c0f8b0af594826f025fc51563..e7a4b8bddb99e56c561a51b218d8fc74e311d200 100644 |
--- a/talk/session/media/channelmanager.cc |
+++ b/talk/session/media/channelmanager.cc |
@@ -212,11 +212,6 @@ bool ChannelManager::Init() { |
<< audio_output_volume_; |
} |
- // Now apply the default video codec that has been set earlier. |
- if (default_video_encoder_config_.max_codec.id != 0) { |
- SetDefaultVideoEncoderConfig(default_video_encoder_config_); |
- } |
- |
return initialized_; |
} |
@@ -450,19 +445,6 @@ bool ChannelManager::SetOutputVolume(int level) { |
return ret; |
} |
-bool ChannelManager::SetDefaultVideoEncoderConfig(const VideoEncoderConfig& c) { |
- bool ret = true; |
- if (initialized_) { |
- ret = worker_thread_->Invoke<bool>( |
- Bind(&MediaEngineInterface::SetDefaultVideoEncoderConfig, |
- media_engine_.get(), c)); |
- } |
- if (ret) { |
- default_video_encoder_config_ = c; |
- } |
- return ret; |
-} |
- |
std::vector<cricket::VideoFormat> ChannelManager::GetSupportedFormats( |
VideoCapturer* capturer) const { |
ASSERT(capturer != NULL); |