[vlc-commits] DMO: use COINIT_MULTITHREADED instead of COINIT_APARTMENTTHREADED

Steve Lhomme git at videolan.org
Thu Mar 19 12:13:10 CET 2015


vlc | branch: master | Steve Lhomme <robUx4 at videolabs.io> | Wed Mar 18 09:57:55 2015 +0000| [6e8d1764f191317f793dbd4b5df60ce040d38358] | committer: Jean-Baptiste Kempf

DMO: use COINIT_MULTITHREADED instead of COINIT_APARTMENTTHREADED

Fixes #14202

All the other CoInitializeEx() calls and now using multithreading, except for
this code which is called in UpdateRects()
See modules/video_output/msw/common.c l286

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/codec/dmo/dmo.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/codec/dmo/dmo.c b/modules/codec/dmo/dmo.c
index 3bd5b14..b969781 100644
--- a/modules/codec/dmo/dmo.c
+++ b/modules/codec/dmo/dmo.c
@@ -368,7 +368,7 @@ static int DecOpen( decoder_t *p_dec )
     WAVEFORMATEX *p_wf = NULL;
 
     /* Initialize OLE/COM */
-    if( FAILED(CoInitializeEx( NULL, COINIT_APARTMENTTHREADED )) )
+    if( FAILED(CoInitializeEx( NULL, COINIT_MULTITHREADED )) )
         vlc_assert_unreachable();
 
     if( LoadDMO( VLC_OBJECT(p_dec), &hmsdmo_dll, &p_dmo, &p_dec->fmt_in, false )
@@ -1397,7 +1397,7 @@ static int EncOpen( vlc_object_t *p_this )
     HINSTANCE hmsdmo_dll = NULL;
 
     /* Initialize OLE/COM */
-    if( FAILED(CoInitializeEx( NULL, COINIT_APARTMENTTHREADED )) )
+    if( FAILED(CoInitializeEx( NULL, COINIT_MULTITHREADED )) )
         vlc_assert_unreachable();
 
     if( LoadDMO( p_this, &hmsdmo_dll, &p_dmo, &p_enc->fmt_out, true )



More information about the vlc-commits mailing list