diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-03 00:10:10 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-03 00:10:10 +0000 |
| commit | 5afac58e83e7cb072ef21d0d4cf9c103eff97a3b (patch) | |
| tree | b13e106b51af3c4fbfb87200aad67a625721a234 /chrome/gpu | |
| parent | 8315330bd8b37e9cea6a085cc612976e22b81924 (diff) | |
| download | chromium_src-5afac58e83e7cb072ef21d0d4cf9c103eff97a3b.zip chromium_src-5afac58e83e7cb072ef21d0d4cf9c103eff97a3b.tar.gz chromium_src-5afac58e83e7cb072ef21d0d4cf9c103eff97a3b.tar.bz2 | |
Revert 58429, 58428, 58427, 58423.
TBR=hclam@chromium.org
Review URL: http://codereview.chromium.org/3337009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58434 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, 4 insertions, 2 deletions
diff --git a/chrome/gpu/DEPS b/chrome/gpu/DEPS index 9597b6b..03e6502 100644 --- a/chrome/gpu/DEPS +++ b/chrome/gpu/DEPS @@ -2,5 +2,6 @@ include_rules = [ "+chrome/app",
"+gpu/command_buffer",
"+media/base",
- "+media/video",
+ "+media/filters",
]
+
diff --git a/chrome/gpu/gpu_video_decoder.h b/chrome/gpu/gpu_video_decoder.h index 977cd02..caed871 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/video/video_decode_engine.h" +#include "media/filters/video_decode_engine.h" #include "ipc/ipc_channel.h" class GpuChannel; @@ -93,3 +93,4 @@ class GpuVideoDecoder }; #endif // CHROME_GPU_GPU_VIDEO_DECODER_H_ + |