projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git]
/
src
/
media
/
video
/
capture
/
win
/
video_capture_device_factory_win.h
diff --git
a/src/media/video/capture/win/video_capture_device_factory_win.h
b/src/media/video/capture/win/video_capture_device_factory_win.h
index
fdec127
..
849e1ad
100644
(file)
--- a/
src/media/video/capture/win/video_capture_device_factory_win.h
+++ b/
src/media/video/capture/win/video_capture_device_factory_win.h
@@
-22,11
+22,11
@@
class MEDIA_EXPORT VideoCaptureDeviceFactoryWin :
virtual ~VideoCaptureDeviceFactoryWin() {}
virtual scoped_ptr<VideoCaptureDevice> Create(
virtual ~VideoCaptureDeviceFactoryWin() {}
virtual scoped_ptr<VideoCaptureDevice> Create(
- const VideoCaptureDevice::Name& device_name)
OVERRIDE
;
- virtual void GetDeviceNames(VideoCaptureDevice::Names* device_names)
OVERRIDE
;
+ const VideoCaptureDevice::Name& device_name)
override
;
+ virtual void GetDeviceNames(VideoCaptureDevice::Names* device_names)
override
;
virtual void GetDeviceSupportedFormats(
const VideoCaptureDevice::Name& device,
virtual void GetDeviceSupportedFormats(
const VideoCaptureDevice::Name& device,
- VideoCaptureFormats* supported_formats)
OVERRIDE
;
+ VideoCaptureFormats* supported_formats)
override
;
private:
bool use_media_foundation_;
private:
bool use_media_foundation_;