diff options
| author | buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-07-29 17:36:52 +0000 |
|---|---|---|
| committer | buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-07-29 17:36:52 +0000 |
| commit | d4e598d57aed714a599444a7eab5e8fdde52a950 (patch) | |
| tree | 67b1dcdcff833ff9e790a23ae35f5f1edeea0c28 /talk/app/webrtc/videosource.h | |
| parent | fc8b0871d9142bb2ca66d4e6ebb278083141e9d3 (diff) | |
| download | webrtc-d4e598d57aed714a599444a7eab5e8fdde52a950.tar.gz | |
(Auto)update libjingle 72097588-> 72159069
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6799 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'talk/app/webrtc/videosource.h')
| -rw-r--r-- | talk/app/webrtc/videosource.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/talk/app/webrtc/videosource.h b/talk/app/webrtc/videosource.h index f58b479c28..e690a5d737 100644 --- a/talk/app/webrtc/videosource.h +++ b/talk/app/webrtc/videosource.h @@ -32,8 +32,8 @@ #include "talk/app/webrtc/notifier.h" #include "talk/app/webrtc/videosourceinterface.h" #include "talk/app/webrtc/videotrackrenderers.h" -#include "talk/base/scoped_ptr.h" -#include "talk/base/sigslot.h" +#include "webrtc/base/scoped_ptr.h" +#include "webrtc/base/sigslot.h" #include "talk/media/base/videocapturer.h" #include "talk/media/base/videocommon.h" @@ -61,7 +61,7 @@ class VideoSource : public Notifier<VideoSourceInterface>, // VideoSource take ownership of |capturer|. // |constraints| can be NULL and in that case the camera is opened using a // default resolution. - static talk_base::scoped_refptr<VideoSource> Create( + static rtc::scoped_refptr<VideoSource> Create( cricket::ChannelManager* channel_manager, cricket::VideoCapturer* capturer, const webrtc::MediaConstraintsInterface* constraints); @@ -90,8 +90,8 @@ class VideoSource : public Notifier<VideoSourceInterface>, void SetState(SourceState new_state); cricket::ChannelManager* channel_manager_; - talk_base::scoped_ptr<cricket::VideoCapturer> video_capturer_; - talk_base::scoped_ptr<cricket::VideoRenderer> frame_input_; + rtc::scoped_ptr<cricket::VideoCapturer> video_capturer_; + rtc::scoped_ptr<cricket::VideoRenderer> frame_input_; cricket::VideoFormat format_; cricket::VideoOptions options_; |