chrome/plugin/chrome_content_plugin_client.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: chrome/plugin/chrome_content_plugin_client.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: chrome/plugin/chrome_content_plugin_client.cc

diff --git a/chrome/plugin/chrome_content_plugin_client.cc b/chrome/plugin/chrome_content_plugin_client.cc

index 3cfce2851cd9241ed5c571a73ebc60fc3d6ef6bb..c998b783c9328df8bb20cd595144421aa73b168f 100644

--- a/chrome/plugin/chrome_content_plugin_client.cc

+++ b/chrome/plugin/chrome_content_plugin_client.cc

@@ -43,11 +43,8 @@ void ChromeContentPluginClient::PreSandboxInitialization() {

LOG(ERROR) << "Failed to load crypto32.dll: " << error.ToString();

#endif // defined(OS_WIN)

- // Load media libraries for the Chromoting client plugin.

- base::FilePath media_path;

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

- if (!media_path.empty())

- media::InitializeMediaLibrary(media_path);

+ // Initialize media libraries for the Chromoting client plugin.

+ media::InitializeMediaLibrary();

#endif // defined(ENABLE_REMOTING)

}