Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(499)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/media.gyp

Issue 100195: Enable video in linux build and remove unneeded ifdefs to guard windows. (Closed)
Patch Set: Fix inifite loop. Created 11 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/ffmpeg_glue.cc ('k') | webkit/webkit.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 5379fbe39eb269b78c4c41e6a6d1856ab66397a5..3077008266e41629827f7ee26107242637f5f98f 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': {
« no previous file with comments | « media/filters/ffmpeg_glue.cc ('k') | webkit/webkit.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698