diff --git a/src/ffmpegsource_common.cpp b/src/ffmpegsource_common.cpp index 5ebb073a2..60a7e91e6 100644 --- a/src/ffmpegsource_common.cpp +++ b/src/ffmpegsource_common.cpp @@ -50,29 +50,9 @@ #include #include -#ifdef _WIN32 -#include - -static void deinit_com(bool) { - CoUninitialize(); -} -#else -static void deinit_com(bool) { } -#endif - FFmpegSourceProvider::FFmpegSourceProvider(agi::BackgroundRunner *br) -: COMInited(false, deinit_com) -, br(br) +: br(br) { -#ifdef _WIN32 - HRESULT res = CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); - if (SUCCEEDED(res)) - COMInited = true; - else if (res != RPC_E_CHANGED_MODE) - throw agi::EnvironmentError("COM initialization failure"); -#endif - - // initialize ffmpegsource FFMS_Init(0, 1); } diff --git a/src/ffmpegsource_common.h b/src/ffmpegsource_common.h index 5ef44b6ec..8cb7f33f6 100644 --- a/src/ffmpegsource_common.h +++ b/src/ffmpegsource_common.h @@ -51,7 +51,6 @@ namespace agi { class BackgroundRunner; } /// @brief Base class for FFMS2 source providers; contains common functions etc class FFmpegSourceProvider { friend class FFmpegSourceCacheCleaner; - agi::scoped_holder COMInited; ///< COM initialization state agi::BackgroundRunner *br; public: