diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-03 00:55:57 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-03 00:55:57 +0000 |
| commit | fda00b70e3df6c27526b9701a7cde872f42ba26b (patch) | |
| tree | e54ae553487005861f7f3acdab84763af1eb9b15 /chrome/gpu | |
| parent | 923d733d12d2dcb01aa64ec825c19444d728d978 (diff) | |
| download | chromium_src-fda00b70e3df6c27526b9701a7cde872f42ba26b.zip chromium_src-fda00b70e3df6c27526b9701a7cde872f42ba26b.tar.gz chromium_src-fda00b70e3df6c27526b9701a7cde872f42ba26b.tar.bz2 | |
Merge remote branch 'origin/trunk' into resubmit
Refactor video decode engines to move them to a new folder
Moving video decode engines and friends to media/video.
TEST=Tree is green. Video plays.
Review URL: http://codereview.chromium.org/3127027
Review URL: http://codereview.chromium.org/3291009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58446 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/gpu')
| -rw-r--r-- | chrome/gpu/DEPS | 3 | ||||
| -rw-r--r-- | chrome/gpu/gpu_video_decoder.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/chrome/gpu/DEPS b/chrome/gpu/DEPS index 03e6502..9597b6b 100644 --- a/chrome/gpu/DEPS +++ b/chrome/gpu/DEPS @@ -2,6 +2,5 @@ include_rules = [ "+chrome/app",
"+gpu/command_buffer",
"+media/base",
- "+media/filters",
+ "+media/video",
]
-
diff --git a/chrome/gpu/gpu_video_decoder.h b/chrome/gpu/gpu_video_decoder.h index caed871..977cd02 100644 --- a/chrome/gpu/gpu_video_decoder.h +++ b/chrome/gpu/gpu_video_decoder.h @@ -10,7 +10,7 @@ #include "base/ref_counted.h" #include "base/scoped_ptr.h" #include "chrome/common/gpu_video_common.h" -#include "media/filters/video_decode_engine.h" +#include "media/video/video_decode_engine.h" #include "ipc/ipc_channel.h" class GpuChannel; @@ -93,4 +93,3 @@ class GpuVideoDecoder }; #endif // CHROME_GPU_GPU_VIDEO_DECODER_H_ - |