content/browser/browser_main_loop.cc - Issue 1141703002: Chromium changes for static linking 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: content/browser/browser_main_loop.cc

Issue 1141703002: Chromium changes for static linking ffmpeg (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Roll DEPS to fix cros, rebase. 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:

Index: content/browser/browser_main_loop.cc

diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc

index 9ed607ac11baf8ef88141b47e6d8e804d1a29acc..0cf536722343455b1d40cddf387ffaf1a119f75b 100644

--- a/content/browser/browser_main_loop.cc

+++ b/content/browser/browser_main_loop.cc

@@ -548,7 +548,7 @@ void BrowserMainLoop::PostMainMessageLoopStart() {

#if !defined(OS_IOS)

{

TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MediaFeatures");

- media::InitializeCPUSpecificMediaFeatures();

+ media::InitializeMediaLibrary();

}

{

TRACE_EVENT0("startup",

« no previous file with comments | « content/app/content_main_runner.cc ('k') | content/content_browsertests.isolate » ('j') | no next file with comments »