| Index: media/video/capture/win/video_capture_device_mf_win.cc
|
| diff --git a/media/video/capture/win/video_capture_device_mf_win.cc b/media/video/capture/win/video_capture_device_mf_win.cc
|
| index dea97b7c26454371ad9435d5547a4e638a0d738c..1dd7bcf5617aea03c4701827077cd9563ba0deba 100644
|
| --- a/media/video/capture/win/video_capture_device_mf_win.cc
|
| +++ b/media/video/capture/win/video_capture_device_mf_win.cc
|
| @@ -70,18 +70,18 @@ bool CreateVideoCaptureDevice(const char* sym_link, IMFMediaSource** source) {
|
| return SUCCEEDED(MFCreateDeviceSource(attributes, source));
|
| }
|
|
|
| -bool FormatFromGuid(const GUID& guid, VideoCaptureCapability::Format* format) {
|
| +bool FormatFromGuid(const GUID& guid, VideoPixelFormat* format) {
|
| struct {
|
| const GUID& guid;
|
| - const VideoCaptureCapability::Format format;
|
| + const VideoPixelFormat format;
|
| } static const kFormatMap[] = {
|
| - { MFVideoFormat_I420, VideoCaptureCapability::kI420 },
|
| - { MFVideoFormat_YUY2, VideoCaptureCapability::kYUY2 },
|
| - { MFVideoFormat_UYVY, VideoCaptureCapability::kUYVY },
|
| - { MFVideoFormat_RGB24, VideoCaptureCapability::kRGB24 },
|
| - { MFVideoFormat_ARGB32, VideoCaptureCapability::kARGB },
|
| - { MFVideoFormat_MJPG, VideoCaptureCapability::kMJPEG },
|
| - { MFVideoFormat_YV12, VideoCaptureCapability::kYV12 },
|
| + { MFVideoFormat_I420, kI420 },
|
| + { MFVideoFormat_YUY2, kYUY2 },
|
| + { MFVideoFormat_UYVY, kUYVY },
|
| + { MFVideoFormat_RGB24, kRGB24 },
|
| + { MFVideoFormat_ARGB32, kARGB },
|
| + { MFVideoFormat_MJPG, kMJPEG },
|
| + { MFVideoFormat_YV12, kYV12 },
|
| };
|
|
|
| for (int i = 0; i < arraysize(kFormatMap); ++i) {
|
|
|