components/html_viewer/media_factory.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: components/html_viewer/media_factory.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: components/html_viewer/media_factory.cc

diff --git a/components/html_viewer/media_factory.cc b/components/html_viewer/media_factory.cc

index 29a153bcdb920372431b29e62ce52283f9d09e67..101015a80c218bc025c5a0fad1fdad863e5ec2a5 100644

--- a/components/html_viewer/media_factory.cc

+++ b/components/html_viewer/media_factory.cc

@@ -88,7 +88,11 @@ MediaFactory::MediaFactory(

->HasSwitch(kEnableMojoMediaRenderer)),

compositor_task_runner_(compositor_task_runner),

shell_(shell) {

- media::InitializeMediaLibrary();

+ if (!media::IsMediaLibraryInitialized()) {

+ base::FilePath module_dir;

+ CHECK(PathService::Get(base::DIR_EXE, &module_dir));

+ CHECK(media::InitializeMediaLibrary(module_dir));

+ }

}

MediaFactory::~MediaFactory() {

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