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

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

Patch Set: Rolling DEPS to pick up ffmpeg GYP changes Created 5 years, 7 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: components/html_viewer/media_factory.cc

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

index eb9a8cee6f641f7fa9e89ea2a0626a17c3e60533..85fa7b3c49a2e0f01b63f0c7a21ee3015fc1d3dd 100644

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

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

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

enable_mojo_media_renderer_(base::CommandLine::ForCurrentProcess()

->HasSwitch(kEnableMojoMediaRenderer)),

compositor_task_runner_(compositor_task_runner) {

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

- base::FilePath module_dir;

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

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

- }

+ media::InitializeMediaLibrary();

}

MediaFactory::~MediaFactory() {