media/base/BUILD.gn - 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/base/BUILD.gn

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/base/BUILD.gn

diff --git a/media/base/BUILD.gn b/media/base/BUILD.gn

index 0ea618831a0ce061c129842b9f04e09b430e86ae..d81171eeb2a06f877793d523634a01b63d4dc367 100644

--- a/media/base/BUILD.gn

+++ b/media/base/BUILD.gn

@@ -216,6 +216,11 @@ source_set("base") {

"media_file_checker.cc",

"media_file_checker.h",

]

+ if (is_win) {

+ sources += [ "media_win.cc" ]

+ } else if (is_posix) {

+ sources += [ "media_posix.cc" ]

+ }

deps += [ "//third_party/ffmpeg" ]

}

@@ -230,6 +235,7 @@ source_set("base") {

}

if (is_android) {

+ sources += [ "media_stub.cc" ]

public_deps = [

"//media/base/android",

"//media/base/android:media_java",

« no previous file with comments | « media/audio_unittests.isolate ('k') | media/base/media.h » ('j') | no next file with comments »