chrome/utility/extensions/extensions_handler.cc - 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: chrome/utility/extensions/extensions_handler.cc

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: chrome/utility/extensions/extensions_handler.cc

diff --git a/chrome/utility/extensions/extensions_handler.cc b/chrome/utility/extensions/extensions_handler.cc

index 942545e1dbf2aefccb5ae25acd5d762657c64774..982045ff9342790f5c76d8e82f99afd3c82b0e23 100644

--- a/chrome/utility/extensions/extensions_handler.cc

+++ b/chrome/utility/extensions/extensions_handler.cc

@@ -65,8 +65,11 @@ void ExtensionsHandler::PreSandboxStartup() {

// Initialize libexif for image metadata parsing.

metadata::ImageMetadataExtractor::InitializeLibrary();

- // Initialize media libraries for media file validation.

- media::InitializeMediaLibrary();

+ // Load media libraries for media file validation.

+ base::FilePath media_path;

+ PathService::Get(content::DIR_MEDIA_LIBS, &media_path);

+ if (!media_path.empty())

+ media::InitializeMediaLibrary(media_path);

}

bool ExtensionsHandler::OnMessageReceived(const IPC::Message& message) {

« no previous file with comments | « chrome/unit_tests.isolate ('k') | chromecast/media/cma/test/run_all_unittests.cc » ('j') | no next file with comments »