| Index: webrtc/video/video_capture_input.h
|
| diff --git a/webrtc/video/video_capture_input.h b/webrtc/video/video_capture_input.h
|
| index 22a8ddc4d4390bd6489ae202998902e2396806d4..2cdcbf806012d2b2b4fdea0ac9c0953565275379 100644
|
| --- a/webrtc/video/video_capture_input.h
|
| +++ b/webrtc/video/video_capture_input.h
|
| @@ -14,6 +14,7 @@
|
| #include <vector>
|
|
|
| #include "webrtc/base/criticalsection.h"
|
| +#include "webrtc/base/platform_thread.h"
|
| #include "webrtc/base/scoped_ptr.h"
|
| #include "webrtc/base/thread_annotations.h"
|
| #include "webrtc/common_types.h"
|
| @@ -23,7 +24,6 @@
|
| #include "webrtc/modules/video_coding/include/video_coding.h"
|
| #include "webrtc/modules/video_processing/include/video_processing.h"
|
| #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
|
| -#include "webrtc/system_wrappers/include/thread_wrapper.h"
|
| #include "webrtc/typedefs.h"
|
| #include "webrtc/video_send_stream.h"
|
|
|
| @@ -78,7 +78,7 @@ class VideoCaptureInput : public webrtc::VideoCaptureInput {
|
| rtc::scoped_ptr<CriticalSectionWrapper> incoming_frame_cs_;
|
| VideoFrame incoming_frame_;
|
|
|
| - rtc::scoped_ptr<ThreadWrapper> encoder_thread_;
|
| + rtc::scoped_ptr<PlatformThread> encoder_thread_;
|
| rtc::scoped_ptr<EventWrapper> capture_event_;
|
|
|
| volatile int stop_;
|
|
|