Chromium changes for static linking ffmpeg

components/html_viewer/media_factory.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/html_viewer/media_factory.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
@@ skipping 62 matching lines @@
       media_thread_("Media"),
       audio_manager_(media::AudioManager::Create(&fake_audio_log_factory_)),
       audio_hardware_config_(
           audio_manager_->GetInputStreamParameters(
               media::AudioManagerBase::kDefaultDeviceId),
           audio_manager_->GetDefaultOutputStreamParameters()),
 #endif
       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() {
 }
 
 blink::WebMediaPlayer* MediaFactory::CreateMediaPlayer(
     blink::WebLocalFrame* frame,
     const blink::WebURL& url,
     blink::WebMediaPlayerClient* client,
     blink::WebContentDecryptionModule* initial_cdm,
@@ skipping 69 matching lines @@
 scoped_refptr<base::SingleThreadTaskRunner>
 MediaFactory::GetMediaThreadTaskRunner() {
   if (!media_thread_.IsRunning())
     media_thread_.Start();
 
   return media_thread_.message_loop_proxy();
 }
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace html_viewer