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

Unified Diff: media/cdm/ppapi/external_clear_key/clear_key_cdm.cc

Issue 2505453002: Remove non-trivial static initializer (Closed)
Patch Set: Created 4 years, 1 month 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
diff --git a/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc b/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
index aaf7c221609c4bb5d63e783b5e1d9720e3a182cc..fbdda3dac3dbfc8dcef5bb3d457c80c85b2fa523 100644
--- a/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
+++ b/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
@@ -46,14 +46,6 @@ MSVC_POP_WARNING();
#if !defined COMPONENT_BUILD
static base::AtExitManager g_at_exit_manager;
#endif
-
-// Prepare media library.
-static bool InitializeFFmpegLibraries() {
- media::InitializeMediaLibrary();
- return true;
-}
-static bool g_ffmpeg_lib_initialized = InitializeFFmpegLibraries();
-
#endif // CLEAR_KEY_CDM_USE_FFMPEG_DECODER
const char kClearKeyCdmVersion[] = "0.1.0.1";
@@ -221,6 +213,7 @@ void ConvertCdmKeysInfo(const std::vector<media::CdmKeyInformation*>& keys_info,
void INITIALIZE_CDM_MODULE() {
DVLOG(1) << __FUNCTION__;
#if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER)
+ media::InitializeMediaLibrary();
av_register_all();
#endif // CLEAR_KEY_CDM_USE_FFMPEG_DECODER
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698