diff options
| author | hubbe <hubbe@chromium.org> | 2015-02-24 16:01:25 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-25 00:01:53 +0000 |
| commit | a5ed06ce43f57f7d4243dae407e16937a2a4e00f (patch) | |
| tree | ef6a37152fbda76335bdc6df07b2b36cae258486 /media/video/capture/linux | |
| parent | 2ec13e9fb3ee8d7b8b8a44e217f388fb350ee5b0 (diff) | |
| download | chromium_src-a5ed06ce43f57f7d4243dae407e16937a2a4e00f.zip chromium_src-a5ed06ce43f57f7d4243dae407e16937a2a4e00f.tar.gz chromium_src-a5ed06ce43f57f7d4243dae407e16937a2a4e00f.tar.bz2 | |
Cast: Basic cast_receiver API for chrome.
Javascript bindings in separate CL.
Review URL: https://codereview.chromium.org/883293005
Cr-Commit-Position: refs/heads/master@{#317925}
Diffstat (limited to 'media/video/capture/linux')
| -rw-r--r-- | media/video/capture/linux/video_capture_device_factory_linux.h | 2 | ||||
| -rw-r--r-- | media/video/capture/linux/video_capture_device_linux.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/video/capture/linux/video_capture_device_factory_linux.h b/media/video/capture/linux/video_capture_device_factory_linux.h index da570e3..8e52abb 100644 --- a/media/video/capture/linux/video_capture_device_factory_linux.h +++ b/media/video/capture/linux/video_capture_device_factory_linux.h @@ -9,7 +9,7 @@ #include "media/video/capture/video_capture_device_factory.h" -#include "media/video/capture/video_capture_types.h" +#include "media/base/video_capture_types.h" namespace media { diff --git a/media/video/capture/linux/video_capture_device_linux.h b/media/video/capture/linux/video_capture_device_linux.h index a52db26..94cbac2 100644 --- a/media/video/capture/linux/video_capture_device_linux.h +++ b/media/video/capture/linux/video_capture_device_linux.h @@ -15,8 +15,8 @@ #include "base/files/file_util.h" #include "base/files/scoped_file.h" #include "base/threading/thread.h" +#include "media/base/video_capture_types.h" #include "media/video/capture/video_capture_device.h" -#include "media/video/capture/video_capture_types.h" namespace media { |