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/media.gyp | |
| 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/media.gyp')
| -rw-r--r-- | media/media.gyp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/media/media.gyp b/media/media.gyp index 15b4266..21f0dc1 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -126,19 +126,19 @@ 'filters/ffmpeg_glue.h', 'filters/ffmpeg_interfaces.cc', 'filters/ffmpeg_interfaces.h', - 'filters/ffmpeg_video_allocator.cc', - 'filters/ffmpeg_video_allocator.h', - 'filters/ffmpeg_video_decode_engine.cc', - 'filters/ffmpeg_video_decode_engine.h', 'filters/ffmpeg_video_decoder.cc', 'filters/ffmpeg_video_decoder.h', 'filters/file_data_source.cc', 'filters/file_data_source.h', 'filters/null_audio_renderer.cc', 'filters/null_audio_renderer.h', - 'filters/video_decode_engine.h', 'filters/video_renderer_base.cc', 'filters/video_renderer_base.h', + 'video/ffmpeg_video_allocator.cc', + 'video/ffmpeg_video_allocator.h', + 'video/ffmpeg_video_decode_engine.cc', + 'video/ffmpeg_video_decode_engine.h', + 'video/video_decode_engine.h', ], 'direct_dependent_settings': { 'include_dirs': [ @@ -170,8 +170,6 @@ }], ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 'sources': [ - 'filters/omx_video_decode_engine.cc', - 'filters/omx_video_decode_engine.h', 'filters/omx_video_decoder.cc', 'filters/omx_video_decoder.h', ], @@ -272,12 +270,12 @@ 'filters/decoder_base_unittest.cc', 'filters/ffmpeg_demuxer_unittest.cc', 'filters/ffmpeg_glue_unittest.cc', - 'filters/ffmpeg_video_decode_engine_unittest.cc', 'filters/ffmpeg_video_decoder_unittest.cc', 'filters/file_data_source_unittest.cc', 'filters/video_renderer_base_unittest.cc', 'omx/mock_omx.cc', 'omx/mock_omx.h', + 'video/ffmpeg_video_decode_engine_unittest.cc', ], 'conditions': [ ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { @@ -569,10 +567,10 @@ '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', ], 'sources': [ - 'filters/omx_video_decode_engine.cc', - 'filters/omx_video_decode_engine.cc', 'omx/omx_configurator.cc', 'omx/omx_configurator.h', + 'video/omx_video_decode_engine.cc', + 'video/omx_video_decode_engine.cc', ], 'hard_dependency': 1, 'export_dependent_settings': [ |