[vlc-commits] Wim32: use CoInitializeEx() instead of CoInitialize()

Rémi Denis-Courmont git at videolan.org
Wed Oct 3 19:12:58 CEST 2012


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Oct  3 20:12:39 2012 +0300| [72b2a691a8c06b3c27d0eefe5998c8d7d35d1b5e] | committer: Rémi Denis-Courmont

Wim32: use CoInitializeEx() instead of CoInitialize()

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=72b2a691a8c06b3c27d0eefe5998c8d7d35d1b5e
---

 modules/access/dshow/dshow.cpp |    4 ++--
 modules/codec/dmo/dmo.c        |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index 384230f..56a042b 100644
--- a/modules/access/dshow/dshow.cpp
+++ b/modules/access/dshow/dshow.cpp
@@ -2019,7 +2019,7 @@ static int FindDevices( vlc_object_t *p_this, const char *psz_name,
     list<string> list_devices;
 
     /* Initialize OLE/COM */
-    CoInitialize( 0 );
+    CoInitializeEx( NULL, COINIT_APARTMENTTHREADED );
 
     FindCaptureDevice( p_this, NULL, &list_devices, b_audio );
 
@@ -2062,7 +2062,7 @@ static int ConfigDevicesCallback( vlc_object_t *p_this, char const *psz_name,
         psz_device = strdup( newval.psz_string );
 
     /* Initialize OLE/COM */
-    CoInitialize( 0 );
+    CoInitializeEx( NULL, COINIT_APARTMENTTHREADED );
 
     p_item = config_FindConfig( p_this, psz_name );
 
diff --git a/modules/codec/dmo/dmo.c b/modules/codec/dmo/dmo.c
index ed62556..d159aca 100644
--- a/modules/codec/dmo/dmo.c
+++ b/modules/codec/dmo/dmo.c
@@ -1429,7 +1429,7 @@ static int EncOpen( vlc_object_t *p_this )
     ldt_fs_t *ldt_fs = Setup_LDT_Keeper();
 #else
     /* Initialize OLE/COM */
-    CoInitialize( 0 );
+    CoInitializeEx( NULL, COINIT_APARTMENTTHREADED );
 #endif /* LOADER */
 
     if( LoadDMO( p_this, &hmsdmo_dll, &p_dmo, &p_enc->fmt_out, true )



More information about the vlc-commits mailing list