diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-15 23:50:57 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-15 23:50:57 +0000 |
| commit | 5942fbfe6efa448722685c6ec3f157a8dd996228 (patch) | |
| tree | 95f3001e63ada59e0d4b57d62025425012ed2545 /media/media.gyp | |
| parent | 9f1591d628b6b90e5bad4ad00264300188b29194 (diff) | |
| download | chromium_src-5942fbfe6efa448722685c6ec3f157a8dd996228.zip chromium_src-5942fbfe6efa448722685c6ec3f157a8dd996228.tar.gz chromium_src-5942fbfe6efa448722685c6ec3f157a8dd996228.tar.bz2 | |
Moving MockFFmpeg to its own file and some media.gyp cleanup.
Step one of having a completely mocked FFmpeg library.
Review URL: http://codereview.chromium.org/126160
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18455 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/media/media.gyp b/media/media.gyp index 8453038..0545788 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -57,9 +57,6 @@ 'base/media.h', 'base/media_format.cc', 'base/media_format.h', - 'base/mock_filter_host.h', - 'base/mock_media_filters.h', - 'base/mock_pipeline.h', 'base/pipeline.h', 'base/pipeline_impl.cc', 'base/pipeline_impl.h', @@ -150,6 +147,11 @@ 'audio/mac/audio_output_mac_unittest.cc', 'audio/simple_sources_unittest.cc', 'base/data_buffer_unittest.cc', + 'base/mock_ffmpeg.cc', + 'base/mock_ffmpeg.h', + 'base/mock_filter_host.h', + 'base/mock_media_filters.h', + 'base/mock_pipeline.h', 'base/pipeline_impl_unittest.cc', 'base/run_all_unittests.cc', 'base/seekable_buffer_unittest.cc', @@ -172,6 +174,7 @@ '../build/linux/system.gyp:gtk', ], 'sources!': [ + 'base/mock_ffmpeg.cc', 'filters/ffmpeg_demuxer_unittest.cc', 'filters/ffmpeg_glue_unittest.cc', 'filters/ffmpeg_video_decoder_unittest.cc', @@ -179,6 +182,7 @@ }], ['OS=="mac"', { 'sources!': [ + 'base/mock_ffmpeg.cc', 'filters/ffmpeg_demuxer_unittest.cc', 'filters/ffmpeg_glue_unittest.cc', 'filters/ffmpeg_video_decoder_unittest.cc', @@ -220,20 +224,20 @@ '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', ], 'sources': [ - 'player/list.h', - 'player/mainfrm.h', - 'player/movie.cc', - 'player/movie.h', - 'player/player_wtl.cc', - 'player/player_wtl.rc', - 'player/props.h', - 'player/seek.h', - 'player/resource.h', - 'player/stdafx.h', - 'player/view.h', - 'player/wtl_renderer.cc', - 'player/wtl_renderer.h', - ], + 'player/list.h', + 'player/mainfrm.h', + 'player/movie.cc', + 'player/movie.h', + 'player/player_wtl.cc', + 'player/player_wtl.rc', + 'player/props.h', + 'player/seek.h', + 'player/resource.h', + 'player/stdafx.h', + 'player/view.h', + 'player/wtl_renderer.cc', + 'player/wtl_renderer.h', + ], 'msvs_settings': { 'VCLinkerTool': { 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS |