From c3df61e3510e67aae266e4196e3f98e48f4e83eb Mon Sep 17 00:00:00 2001 From: "buildbot@webrtc.org" Date: Wed, 13 Aug 2014 23:57:23 +0000 Subject: [PATCH] (Auto)update libjingle 73256845-> 73260148 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6898 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/media/base/videocapturer.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/talk/media/base/videocapturer.cc b/talk/media/base/videocapturer.cc index 85c27f291..c72201262 100644 --- a/talk/media/base/videocapturer.cc +++ b/talk/media/base/videocapturer.cc @@ -130,6 +130,14 @@ void VideoCapturer::Construct() { adapt_frame_drops_ = 0; effect_frame_drops_ = 0; previous_frame_time_ = 0.0; +#ifdef HAVE_WEBRTC_VIDEO + // There are lots of video capturers out there that don't call + // set_frame_factory. We can either go change all of them, or we + // can set this default. + // TODO(pthatcher): Remove this hack and require the frame factory + // to be passed in the constructor. + set_frame_factory(new WebRtcVideoFrameFactory()); +#endif } const std::vector* VideoCapturer::GetSupportedFormats() const {