generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reverting part of

Browse Source 
https://webrtc-codereview.appspot.com/15089004/diff/140001/talk/session/media/channelmanager.cc?context=10&column_width=80
because of a major regression hanging the executable on start.

R=jiayl@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/22799004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7309 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
thorcarpenter@google.com 2014-09-26 17:19:14 +00:00
parent 1fd362c31e
commit a21d071607
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
talk/session/media/channelmanager.cc
View File

@ -137,12 +137,6 @@ void ChannelManager::Construct(MediaEngineInterface* me,
this, &ChannelManager::OnVideoCaptureStateChange);
capture_manager_->SignalCapturerStateChange.connect(
this, &ChannelManager::OnVideoCaptureStateChange);
if (worker_thread_ != rtc::Thread::Current()) {
// Do not allow invoking calls to other threads on the worker thread.
worker_thread_->Invoke<bool>(
rtc::Bind(&rtc::Thread::SetAllowBlockingCalls, worker_thread_, false));
}
}
ChannelManager::~ChannelManager() {