Rebase.
git-svn-id: http://libjingle.googlecode.com/svn/trunk@79 dd674b97-3498-5ee5-1854-bdd07cd0ff33
diff --git a/CHANGELOG b/CHANGELOG
index 8ab3d49..f97be9f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,10 @@
Libjingle
+0.5.9 - Aug 31, 2011
+ - Updated STUN support (RFC 5389)
+ - Video output scaling
+ - Refactoring and bug fixes
+
0.5.8 - July 1, 2011
- Support for loudest speaker detection
diff --git a/talk/session/phone/channelmanager.cc b/talk/session/phone/channelmanager.cc
index 97419cb..0d11b53 100644
--- a/talk/session/phone/channelmanager.cc
+++ b/talk/session/phone/channelmanager.cc
@@ -654,8 +654,6 @@
void ChannelManager::OnVideoCaptureResult(VideoCapturer* capturer,
CaptureResult result) {
- // TODO: Check capturer and signal failure only for camera video, not
- // screencast.
capturing_ = result == CR_SUCCESS;
main_thread_->Post(this, MSG_CAMERASTARTED,
new talk_base::TypedMessageData<CaptureResult>(result));