ffmpeg.gyp - Issue 11943010: NOT FOR SUBMISSION: Enable FFmpeg on Android.

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: ffmpeg.gyp

Issue 11943010: NOT FOR SUBMISSION: Enable FFmpeg on Android. Base URL: https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@master

Patch Set: Created 7 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: ffmpeg.gyp

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

index 090e42fce238a9c5c1f19e8f5c0052577f02e262..62ee8fb8bddc0f70de1b4ecbecc289ebcd125dbf 100644

--- a/ffmpeg.gyp

+++ b/ffmpeg.gyp

@@ -58,7 +58,7 @@

['chromeos == 1', {

'ffmpeg_branding%': '<(branding)OS',

}, { # otherwise, assume Chrome/Chromium.

- 'ffmpeg_branding%': '<(branding)',

+ 'ffmpeg_branding%': 'Chrome',

}],

« no previous file with comments | « chromium/config/Chromium/linux/arm/config.h ('k') | no next file » | no next file with comments »