Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1159)

Unified Diff: media/video/capture/mac/video_capture_device_mac.h

Issue 10035054: Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fix a namespace issue Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/video/capture/mac/video_capture_device_mac.h
diff --git a/media/video/capture/mac/video_capture_device_mac.h b/media/video/capture/mac/video_capture_device_mac.h
index c15fcec81204d61b4655949ab6b1c7b7ca1893c3..046282efedeb9c2cfac6a12e92d03c35de99c0b6 100644
--- a/media/video/capture/mac/video_capture_device_mac.h
+++ b/media/video/capture/mac/video_capture_device_mac.h
@@ -11,6 +11,7 @@
#include "base/compiler_specific.h"
#include "media/video/capture/video_capture_device.h"
+#include "media/video/capture/video_capture_types.h"
@class VideoCaptureDeviceQTKit;
@@ -37,7 +38,7 @@ class VideoCaptureDeviceMac : public VideoCaptureDevice {
// Called to deliver captured video frames.
void ReceiveFrame(const uint8* video_frame, int video_frame_length,
- const Capability& frame_info);
+ const VideoCaptureCapability& frame_info);
private:
void SetErrorState(const std::string& reason);
« no previous file with comments | « media/video/capture/linux/video_capture_device_linux.cc ('k') | media/video/capture/mac/video_capture_device_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698