diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-08 02:09:20 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-08 02:09:20 +0000 |
| commit | 0b9695e4d7207c23fec64eb685ddcd8ff76f4c9f (patch) | |
| tree | 15301aa63239983bd1ebb0224c5fc47d0ceac8e1 /media/media.gyp | |
| parent | fc25aab270029d68109c4a1cc99bdc1e46f3c03b (diff) | |
| download | chromium_src-0b9695e4d7207c23fec64eb685ddcd8ff76f4c9f.zip chromium_src-0b9695e4d7207c23fec64eb685ddcd8ff76f4c9f.tar.gz chromium_src-0b9695e4d7207c23fec64eb685ddcd8ff76f4c9f.tar.bz2 | |
Retry of enabling video on linux. See related review: http://codereview.chromium.org/100195
The effective changes were:
1) Adding av_register_protocol into the def file for ffmpeg in windows.
2) Commenting out the drawing glue code for non-skia platforms.
3) Fixing some mac compilation error caused by code drift.
Review URL: http://codereview.chromium.org/99306
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15611 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/media/media.gyp b/media/media.gyp index 15a7ecc..58297ed 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -99,13 +99,6 @@ }, '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?$' ] ], }], @@ -116,12 +109,8 @@ '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework', ], }, - 'sources!': [ - 'filters/ffmpeg_audio_decoder.cc', - 'filters/ffmpeg_glue.cc', - 'filters/ffmpeg_video_decoder.cc', + 'sources/': [ ['exclude', '_(linux|win)\\.cc$'], ], - 'sources/': [ ['exclude', '_(linux|win)\\.cc$'] ], }], [ 'OS == "win"', { 'sources/': [ ['exclude', '_(linux|mac|posix)\\.cc$'], |