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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/media.gyp

Issue 839763002: fix builds with vpx and/or ffmpeg disabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add fixups Created 5 years, 11 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
« media/filters/default_renderer_factory.cc ('K') | « media/filters/default_renderer_factory.cc ('k') | media/mojo/services/renderer_config_default.cc » ('j') | media/mojo/services/renderer_config_default.cc » ('J')
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 888369505a728ba024fba46be15f60362781f9bc..1291f61604bd4d6139645908c2124ae37a347f0c 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -645,12 +645,23 @@
'filters/in_memory_url_protocol.cc',
'filters/in_memory_url_protocol.h',
],
+ 'defines': [
+ 'MEDIA_DISABLE_FFMPEG',
+ ],
+ 'direct_dependent_settings': {
+ 'defines': [
+ 'MEDIA_DISABLE_FFMPEG',
+ ],
+ },
}],
['media_use_libvpx==1', {
'dependencies': [
'<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx',
],
}, { # media_use_libvpx==0
+ 'defines': [
+ 'MEDIA_DISABLE_LIBVPX',
+ ],
'direct_dependent_settings': {
'defines': [
'MEDIA_DISABLE_LIBVPX',
« media/filters/default_renderer_factory.cc ('K') | « media/filters/default_renderer_factory.cc ('k') | media/mojo/services/renderer_config_default.cc » ('j') | media/mojo/services/renderer_config_default.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698