media/media.gyp - Issue 839763002: fix builds with vpx and/or ffmpeg disabled

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: fix builds with ffmpeg disabled also 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:

Index: media/media.gyp

diff --git a/media/media.gyp b/media/media.gyp

index 888369505a728ba024fba46be15f60362781f9bc..c20f3472fe221a6d7e8d1bbd60aff243bc5667b7 100644

--- a/media/media.gyp

+++ b/media/media.gyp

@@ -645,12 +645,18 @@

'filters/in_memory_url_protocol.cc',

'filters/in_memory_url_protocol.h',

+ 'defines': [

+ 'MEDIA_DISABLE_FFMPEG',

xhwang 2015/01/07 17:12:30 also add 'direct_dependent_settings' (same as l.66

Mostyn Bramley-Moore 2015/01/07 19:29:53 Done.

+ ],

}],

['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',