diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-01 23:25:36 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-01 23:25:36 +0000 |
| commit | 3579c4dbb74148d4d3f0bb594a099c97811b029e (patch) | |
| tree | 5fa9f0c6a7f30f8cc6053e66995c7b96bf035648 /media/media.gyp | |
| parent | c238b694ea2c28b28c30f983e38ccf846a637234 (diff) | |
| download | chromium_src-3579c4dbb74148d4d3f0bb594a099c97811b029e.zip chromium_src-3579c4dbb74148d4d3f0bb594a099c97811b029e.tar.gz chromium_src-3579c4dbb74148d4d3f0bb594a099c97811b029e.tar.bz2 | |
Revert "Enable video in posix builds and remove unneeded ifdefs to guard windows."
This reverts commit 9c23aa9006918e7091742e1826181db081a16a65.
TBR=evan
Review URL: http://codereview.chromium.org/101020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15121 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/media/media.gyp b/media/media.gyp index 3077008..5379fbe 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -101,7 +101,15 @@ }, 'conditions': [ ['OS =="linux"', { - 'sources/': [ ['exclude', '_(mac|win)\\.cc$'] ], + 'sources!': [ + 'filters/ffmpeg_audio_decoder.cc', + 'filters/ffmpeg_demuxer.cc', + 'filters/ffmpeg_demuxer.h', + 'filters/ffmpeg_glue.cc', + 'filters/ffmpeg_video_decoder.cc', + ], + 'sources/': [ ['exclude', '_(mac|win)\\.cc$'], + ['exclude', '\\.mm?$' ] ], }], ['OS =="mac"', { 'link_settings': { |