diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-18 00:36:22 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-18 00:36:22 +0000 |
| commit | 10000d66052ed5a1c42f5173bd93ea0af8a6d19b (patch) | |
| tree | 272e718e2858efd87e71af38fcffd897fd4c6e94 /media/media.gyp | |
| parent | 359cadcdcebadd6d9d87ee92d3dace00ad0a0736 (diff) | |
| download | chromium_src-10000d66052ed5a1c42f5173bd93ea0af8a6d19b.zip chromium_src-10000d66052ed5a1c42f5173bd93ea0af8a6d19b.tar.gz chromium_src-10000d66052ed5a1c42f5173bd93ea0af8a6d19b.tar.bz2 | |
Move the ffmpeg loading function into media library.
This will allow us to hide the platform specific library loading code from the main chrome code.
Review URL: http://codereview.chromium.org/69027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13991 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/media/media.gyp b/media/media.gyp index 2c85e3a..fec2b64 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -49,6 +49,9 @@ 'base/filter_host_impl.cc', 'base/filter_host_impl.h', 'base/filters.h', + 'base/media_posix.cc', + 'base/media_win.cc', + 'base/media.h', 'base/media_format.cc', 'base/media_format.h', 'base/mock_filter_host.h', @@ -101,6 +104,8 @@ 'filters/ffmpeg_glue.cc', 'filters/ffmpeg_video_decoder.cc', ], + 'sources/': [ ['exclude', '_(mac|win)\\.cc$'], + ['exclude', '\\.mm?$' ] ], }], ['OS =="mac"', { 'link_settings': { @@ -114,6 +119,11 @@ 'filters/ffmpeg_glue.cc', 'filters/ffmpeg_video_decoder.cc', ], + 'sources/': [ ['exclude', '_(linux|win)\\.cc$'] ], + }], + [ 'OS == "win"', { + 'sources/': [ ['exclude', '_(linux|mac|posix)\\.cc$'], + ['exclude', '\\.mm?$' ] ], }], ], }, |