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 /media/mf | |
| 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 'media/mf')
| -rw-r--r-- | media/mf/mft_h264_decoder.h | 2 | ||||
| -rw-r--r-- | media/mf/test/mft_h264_decoder_unittest.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/mf/mft_h264_decoder.h b/media/mf/mft_h264_decoder.h index bcb45c4..b84ab97 100644 --- a/media/mf/mft_h264_decoder.h +++ b/media/mf/mft_h264_decoder.h @@ -19,7 +19,7 @@ #include "base/gtest_prod_util.h" #include "base/scoped_comptr_win.h" -#include "media/filters/video_decode_engine.h" +#include "media/video/video_decode_engine.h" class MessageLoop; diff --git a/media/mf/test/mft_h264_decoder_unittest.cc b/media/mf/test/mft_h264_decoder_unittest.cc index 0e78449..c14a3e41 100644 --- a/media/mf/test/mft_h264_decoder_unittest.cc +++ b/media/mf/test/mft_h264_decoder_unittest.cc @@ -12,9 +12,9 @@ #include "base/time.h" #include "media/base/data_buffer.h" #include "media/base/video_frame.h" -#include "media/filters/video_decode_engine.h" #include "media/mf/file_reader_util.h" #include "media/mf/mft_h264_decoder.h" +#include "media/video/video_decode_engine.h" #include "testing/gtest/include/gtest/gtest.h" using base::TimeDelta; |