| Index: media/capture/video/win/video_capture_device_mf_win.h
|
| diff --git a/media/capture/video/win/video_capture_device_mf_win.h b/media/capture/video/win/video_capture_device_mf_win.h
|
| index 68cd4f8b489bb46a59ecda81ecb34add7e3291bf..3b2b7e3a05917d9f40855670658051f330580b9f 100644
|
| --- a/media/capture/video/win/video_capture_device_mf_win.h
|
| +++ b/media/capture/video/win/video_capture_device_mf_win.h
|
| @@ -16,8 +16,8 @@
|
| #include <vector>
|
|
|
| #include "base/macros.h"
|
| +#include "base/sequence_checker.h"
|
| #include "base/synchronization/lock.h"
|
| -#include "base/threading/non_thread_safe.h"
|
| #include "base/win/scoped_comptr.h"
|
| #include "media/capture/capture_export.h"
|
| #include "media/capture/video/video_capture_device.h"
|
| @@ -35,8 +35,7 @@ class MFReaderCallback;
|
| const DWORD kFirstVideoStream =
|
| static_cast<DWORD>(MF_SOURCE_READER_FIRST_VIDEO_STREAM);
|
|
|
| -class CAPTURE_EXPORT VideoCaptureDeviceMFWin : public base::NonThreadSafe,
|
| - public VideoCaptureDevice {
|
| +class CAPTURE_EXPORT VideoCaptureDeviceMFWin : public VideoCaptureDevice {
|
| public:
|
| static bool FormatFromGuid(const GUID& guid, VideoPixelFormat* format);
|
|
|
| @@ -73,6 +72,8 @@ class CAPTURE_EXPORT VideoCaptureDeviceMFWin : public base::NonThreadSafe,
|
| VideoCaptureFormat capture_format_;
|
| bool capture_;
|
|
|
| + SEQUENCE_CHECKER(sequence_checker_);
|
| +
|
| DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceMFWin);
|
| };
|
|
|
|
|