| Index: device/capture/video/mac/video_capture_device_decklink_mac.h
|
| diff --git a/media/capture/video/mac/video_capture_device_decklink_mac.h b/device/capture/video/mac/video_capture_device_decklink_mac.h
|
| similarity index 91%
|
| rename from media/capture/video/mac/video_capture_device_decklink_mac.h
|
| rename to device/capture/video/mac/video_capture_device_decklink_mac.h
|
| index 12bd3d706b459855133209953307c02712fe748a..0d99cf914c03f4272d95a9b5d36d499e8e0c25e2 100644
|
| --- a/media/capture/video/mac/video_capture_device_decklink_mac.h
|
| +++ b/device/capture/video/mac/video_capture_device_decklink_mac.h
|
| @@ -5,10 +5,10 @@
|
| // Implementation of VideoCaptureDevice class for Blackmagic video capture
|
| // devices by using the DeckLink SDK.
|
|
|
| -#ifndef MEDIA_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_DECKLINK_MAC_H_
|
| -#define MEDIA_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_DECKLINK_MAC_H_
|
| +#ifndef DEVICE_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_DECKLINK_MAC_H_
|
| +#define DEVICE_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_DECKLINK_MAC_H_
|
|
|
| -#include "media/capture/video/video_capture_device.h"
|
| +#include "device/capture/video/video_capture_device.h"
|
|
|
| #import <Foundation/Foundation.h>
|
| #include <stddef.h>
|
| @@ -26,7 +26,7 @@ namespace tracked_objects {
|
| class Location;
|
| } // namespace tracked_objects
|
|
|
| -namespace media {
|
| +namespace device {
|
|
|
| // Extension of VideoCaptureDevice to create and manipulate Blackmagic devices.
|
| // Creates a reference counted |decklink_capture_delegate_| that does all the
|
| @@ -89,6 +89,6 @@ class CAPTURE_EXPORT VideoCaptureDeviceDeckLinkMac : public VideoCaptureDevice {
|
| DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceDeckLinkMac);
|
| };
|
|
|
| -} // namespace media
|
| +} // namespace device
|
|
|
| -#endif // MEDIA_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_DECKLINK_MAC_H_
|
| +#endif // DEVICE_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_DECKLINK_MAC_H_
|
|
|