media/media.gyp - Issue 1569053002: Raise gyp/GN failure if proprietary_codecs=1 and ffmpeg_branding=Chromium

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 1569053002: Raise gyp/GN failure if proprietary_codecs=1 and ffmpeg_branding=Chromium (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 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

Index: media/media.gyp

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

index 89e1ade22695a566e6b3fe11a4fe4a46eaab32ab..2b6ba8e07d02b212e2f1ad290cf39e12d240da3a 100644

--- a/media/media.gyp

+++ b/media/media.gyp

@@ -1133,6 +1133,9 @@

'filters/ffmpeg_h265_to_annex_b_bitstream_converter.h',

}],

+ ['proprietary_codecs==1 and media_use_ffmpeg==1 and ffmpeg_branding=="Chromium"', {

+ 'fail%': "<!(echo proprietary codecs and ffmpeg_branding set to Chromium are incompatible; exit 1)>",

jrummell 2016/01/11 22:05:47 Not sure if fail needs to be a variable. 'fail' al

+ }],

['target_arch=="ia32" or target_arch=="x64"', {

'dependencies': [

'media_asm',

« media/BUILD.gn ('K') | « media/BUILD.gn ('k') | no next file » | no next file with comments »