| Index: device/capture/video/win/capability_list_win.h
|
| diff --git a/media/capture/video/win/capability_list_win.h b/device/capture/video/win/capability_list_win.h
|
| similarity index 82%
|
| rename from media/capture/video/win/capability_list_win.h
|
| rename to device/capture/video/win/capability_list_win.h
|
| index 526f67c15fc1c03710179f398f3ebcd64df69176..025d6ffae9456382b4b47e1db4c18540d4256b70 100644
|
| --- a/media/capture/video/win/capability_list_win.h
|
| +++ b/device/capture/video/win/capability_list_win.h
|
| @@ -6,15 +6,17 @@
|
| // DirectShow is used for capturing. DirectShow provide its own threads
|
| // for capturing.
|
|
|
| -#ifndef MEDIA_CAPTURE_VIDEO_WIN_CAPABILITY_LIST_WIN_H_
|
| -#define MEDIA_CAPTURE_VIDEO_WIN_CAPABILITY_LIST_WIN_H_
|
| +#ifndef DEVICE_CAPTURE_VIDEO_WIN_CAPABILITY_LIST_WIN_H_
|
| +#define DEVICE_CAPTURE_VIDEO_WIN_CAPABILITY_LIST_WIN_H_
|
|
|
| #include <list>
|
| #include <windows.h>
|
|
|
| #include "media/base/video_capture_types.h"
|
|
|
| -namespace media {
|
| +namespace device {
|
| +
|
| +using media::VideoCaptureFormat;
|
|
|
| struct CapabilityWin {
|
| CapabilityWin(int index, const VideoCaptureFormat& format)
|
| @@ -41,6 +43,6 @@ const CapabilityWin& GetBestMatchedCapability(
|
| const VideoCaptureFormat& requested,
|
| const CapabilityList& capabilities);
|
|
|
| -} // namespace media
|
| +} // namespace device
|
|
|
| -#endif // MEDIA_CAPTURE_VIDEO_WIN_CAPABILITY_LIST_WIN_H_
|
| +#endif // DEVICE_CAPTURE_VIDEO_WIN_CAPABILITY_LIST_WIN_H_
|
|
|