media/media_nacl.gyp - Issue 1161183003: Revert "Chromium changes to statically link ffmpeg."

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_nacl.gyp

Issue 1161183003: Revert "Chromium changes to statically link ffmpeg." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 6 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_nacl.gyp

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

index f345376f658d8e7137f7cb5beb302f98c8855b62..9697a8a21f05ccaa687dddbcf6d290ca1c5390d4 100644

--- a/media/media_nacl.gyp

+++ b/media/media_nacl.gyp

@@ -53,6 +53,7 @@

'sources': [

'base/media.cc',

'base/media.h',

+ 'base/media_stub.cc',

'base/simd/convert_rgb_to_yuv.h',

'base/simd/convert_rgb_to_yuv_c.cc',

'base/simd/convert_yuv_to_rgb.h',

@@ -62,9 +63,6 @@

'base/yuv_convert.cc',

'base/yuv_convert.h',

- 'defines': [

- 'MEDIA_DISABLE_FFMPEG',

- ],

}, # end of target 'media_yuv_nacl'

}],

« no previous file with comments | « media/media.gyp ('k') | media/media_unittests.isolate » ('j') | no next file with comments »