diff options
Diffstat (limited to 'www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc')
-rw-r--r-- | www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc index a88d1e0d757a..3e51687048e4 100644 --- a/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc +++ b/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc @@ -1,4 +1,4 @@ ---- media/capture/video/video_capture_device_factory.cc.orig 2017-01-26 00:49:15 UTC +--- media/capture/video/video_capture_device_factory.cc.orig 2017-04-19 19:06:35 UTC +++ media/capture/video/video_capture_device_factory.cc @@ -18,6 +18,10 @@ namespace media { std::unique_ptr<VideoCaptureDeviceFactory> @@ -11,7 +11,7 @@ const base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); // Use a Fake or File Video Device Factory if the command line flags are -@@ -36,6 +40,7 @@ VideoCaptureDeviceFactory::CreateFactory +@@ -42,6 +46,7 @@ VideoCaptureDeviceFactory::CreateFactory return std::unique_ptr<VideoCaptureDeviceFactory>( CreateVideoCaptureDeviceFactory(ui_task_runner)); } @@ -19,7 +19,7 @@ } VideoCaptureDeviceFactory::VideoCaptureDeviceFactory() { -@@ -55,7 +60,7 @@ void VideoCaptureDeviceFactory::Enumerat +@@ -61,7 +66,7 @@ void VideoCaptureDeviceFactory::Enumerat callback.Run(std::move(device_descriptors)); } |