From 1519ee5ce645f10c2845d0b1aba7eccb729a0e42 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Fri, 14 Apr 2006 22:36:07 +0000 Subject: [PATCH] initialize libavcodec on startup Originally committed to SVN as r327. --- core/lavc_file.cpp | 7 +++++++ core/lavc_file.h | 7 +++++++ core/video_provider_lavc.cpp | 7 ------- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/core/lavc_file.cpp b/core/lavc_file.cpp index c5fef96c8..44f6e86a4 100644 --- a/core/lavc_file.cpp +++ b/core/lavc_file.cpp @@ -38,6 +38,13 @@ #ifdef USE_LAVC +LAVCFile::Initializer LAVCFile::init; + +LAVCFile::Initializer::Initializer() +{ + av_register_all(); +} + LAVCFile::LAVCFile(wxString filename) { int result = 0; diff --git a/core/lavc_file.h b/core/lavc_file.h index 02e048376..adddfc5ee 100644 --- a/core/lavc_file.h +++ b/core/lavc_file.h @@ -48,6 +48,13 @@ private: LAVCFile(wxString filename); ~LAVCFile(); + + class Initializer { + public: + Initializer(); + }; + static Initializer init; + public: AVFormatContext *fctx; diff --git a/core/video_provider_lavc.cpp b/core/video_provider_lavc.cpp index 1238b75c6..15c812fbf 100644 --- a/core/video_provider_lavc.cpp +++ b/core/video_provider_lavc.cpp @@ -62,13 +62,6 @@ LAVCVideoProvider::LAVCVideoProvider(wxString filename, wxString subfilename) { zoom = 1.0; validFrame = false; - // Register types - static bool avRegistered = false; - if (!avRegistered) { - av_register_all(); - avRegistered = true; - } - // Load LoadVideo(filename); }