From b8fa7e010bec9c61181a44058c928ac2b2852e37 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Mon, 4 Apr 2016 11:24:14 -0700
Subject: [PATCH] Don't init COM for FFMS2

FFMS2 no longer uses COM for anything.
---
 src/ffmpegsource_common.cpp | 22 +---------------------
 src/ffmpegsource_common.h   |  1 -
 2 files changed, 1 insertion(+), 22 deletions(-)

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 <wx/intl.h>
 #include <wx/choicdlg.h>
 
-#ifdef _WIN32
-#include <objbase.h>
-
-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<bool> COMInited; ///< COM initialization state
 	agi::BackgroundRunner *br;
 
 public: