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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/html_viewer/web_media_player_factory.cc

Issue 1179953006: [Merge to M44] Chromium changes to statically link ffmpeg. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2403
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
« no previous file with comments | « components/components_unittests.isolate ('k') | content/app/content_main_runner.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..9907e7d96046a543204e1f60c92cd25bd4168b3d 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() {
« no previous file with comments | « components/components_unittests.isolate ('k') | content/app/content_main_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698