(Auto)update libjingle 73256845-> 73260148
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6898 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
parent
22fa032f22
commit
c3df61e351
@ -130,6 +130,14 @@ void VideoCapturer::Construct() {
|
|||||||
adapt_frame_drops_ = 0;
|
adapt_frame_drops_ = 0;
|
||||||
effect_frame_drops_ = 0;
|
effect_frame_drops_ = 0;
|
||||||
previous_frame_time_ = 0.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<VideoFormat>* VideoCapturer::GetSupportedFormats() const {
|
const std::vector<VideoFormat>* VideoCapturer::GetSupportedFormats() const {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user