Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(339)

Unified Diff: components/html_viewer/web_media_player_factory.cc

Issue 1141703002: Chromium changes for static linking ffmpeg (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updating media library initialize calls 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:
View side-by-side diff with in-line comments
Download patch
Index: components/html_viewer/web_media_player_factory.cc
diff --git a/components/html_viewer/web_media_player_factory.cc b/components/html_viewer/web_media_player_factory.cc
index 2898feb4cb85f0af45e04229c5dd6a91fbc7cf76..0991f405df33959b8ba9c92e94b8d743ac7954c7 100644
--- a/components/html_viewer/web_media_player_factory.cc
+++ b/components/html_viewer/web_media_player_factory.cc
@@ -63,12 +63,7 @@ WebMediaPlayerFactory::WebMediaPlayerFactory(
audio_manager_->GetInputStreamParameters(
media::AudioManagerBase::kDefaultDeviceId),
audio_manager_->GetDefaultOutputStreamParameters()) {
-
- if (!media::IsMediaLibraryInitialized()) {
- base::FilePath module_dir;
- CHECK(PathService::Get(base::DIR_EXE, &module_dir));
- CHECK(media::InitializeMediaLibrary(module_dir));
- }
+ media::InitializeMediaLibrary();
}
WebMediaPlayerFactory::~WebMediaPlayerFactory() {

Powered by Google App Engine
This is Rietveld 408576698