summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-02 23:45:17 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-02 23:45:17 +0000
commitef0a1d9f2e665e5e33a2566caec6e588f2e3fc4a (patch)
tree6b46d8854858690280bb68481aca4175d49aa095 /media
parentb57c07779e9f1e6af2d45d89102d8772d6b72819 (diff)
downloadchromium_src-ef0a1d9f2e665e5e33a2566caec6e588f2e3fc4a.zip
chromium_src-ef0a1d9f2e665e5e33a2566caec6e588f2e3fc4a.tar.gz
chromium_src-ef0a1d9f2e665e5e33a2566caec6e588f2e3fc4a.tar.bz2
Build fix. Fix include to point to new locations.
TBR=akalin@chromium.org BUG= TEST= Review URL: http://codereview.chromium.org/3300009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58427 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/mf/mft_h264_decoder.h2
-rw-r--r--media/mf/test/mft_h264_decoder_unittest.cc2
-rw-r--r--media/omx/omx_codec_unittest.cc4
-rw-r--r--media/tools/omx_test/omx_test.cc2
4 files changed, 5 insertions, 5 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;
diff --git a/media/omx/omx_codec_unittest.cc b/media/omx/omx_codec_unittest.cc
index 92bb25f..0e4b258 100644
--- a/media/omx/omx_codec_unittest.cc
+++ b/media/omx/omx_codec_unittest.cc
@@ -14,8 +14,8 @@
#include "media/base/mock_filters.h"
#include "media/base/mock_task.h"
#include "media/ffmpeg/ffmpeg_common.h"
-#include "media/filters/omx_video_decode_engine.h"
-#include "media/filters/video_decode_engine.h"
+#include "media/video/omx_video_decode_engine.h"
+#include "media/video/video_decode_engine.h"
#include "media/omx/mock_omx.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/tools/omx_test/omx_test.cc b/media/tools/omx_test/omx_test.cc
index efddb14..e48251c 100644
--- a/media/tools/omx_test/omx_test.cc
+++ b/media/tools/omx_test/omx_test.cc
@@ -22,10 +22,10 @@
#include "media/ffmpeg/ffmpeg_common.h"
#include "media/ffmpeg/file_protocol.h"
#include "media/filters/bitstream_converter.h"
-#include "media/filters/omx_video_decode_engine.h"
#include "media/tools/omx_test/color_space_util.h"
#include "media/tools/omx_test/file_reader_util.h"
#include "media/tools/omx_test/file_sink.h"
+#include "media/video/omx_video_decode_engine.h"
using media::BlockFileReader;
using media::Buffer;