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 /media/omx | |
| 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 'media/omx')
| -rw-r--r-- | media/omx/omx_codec_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/omx/omx_codec_unittest.cc b/media/omx/omx_codec_unittest.cc index 0e4b258..92bb25f 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/video/omx_video_decode_engine.h" -#include "media/video/video_decode_engine.h" +#include "media/filters/omx_video_decode_engine.h" +#include "media/filters/video_decode_engine.h" #include "media/omx/mock_omx.h" #include "testing/gtest/include/gtest/gtest.h" |