diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-01 23:16:19 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-01 23:16:19 +0000 |
| commit | c06c86a302db8c82698b8a3cc0f92ff5b22a412b (patch) | |
| tree | 0fff52f3eac0ed3d76026ba58b41bc287e0afbb3 /media/media.gyp | |
| parent | 5a947d5adcf66fef98c357f2b63eccd84762b83b (diff) | |
| download | chromium_src-c06c86a302db8c82698b8a3cc0f92ff5b22a412b.zip chromium_src-c06c86a302db8c82698b8a3cc0f92ff5b22a412b.tar.gz chromium_src-c06c86a302db8c82698b8a3cc0f92ff5b22a412b.tar.bz2 | |
Enable video in posix builds and remove unneeded ifdefs to guard windows.
The code still crashes when trying to play a video, but this will allow debugging.
Review URL: http://codereview.chromium.org/100195
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15117 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/media/media.gyp b/media/media.gyp index 5379fbe..3077008 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -101,15 +101,7 @@ }, 'conditions': [ ['OS =="linux"', { - '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?$' ] ], + 'sources/': [ ['exclude', '_(mac|win)\\.cc$'] ], }], ['OS =="mac"', { 'link_settings': { |