summaryrefslogtreecommitdiffstats
path: root/avmedia
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2020-05-22 14:33:24 +0200
committerJulien Nabet <serval2412@yahoo.fr>2020-05-22 22:22:15 +0200
commitb587de60d4e6aa96238766272d94f1499b22f696 (patch)
tree87c816f7d444f79aceb81aca6969adf8c0a14f98 /avmedia
parentalways use region band in Skia's setClipRegion (tdf#133208) (diff)
downloadcore-b587de60d4e6aa96238766272d94f1499b22f696.tar.gz
core-b587de60d4e6aa96238766272d94f1499b22f696.zip
Prefer CoInitializeEx instead of CoInitialize
As https://docs.microsoft.com/fr-fr/windows/win32/api/objbase/nf-objbase-coinitialize?redirectedfrom=MSDN advised. Moreover, it'll make concurrency model explicit Change-Id: I247a49248bf45beb64a7985a7c0d078ee48efe2d Change-Id: I6e755fd516d9fb2dd2a9df0c66d9afd6070447ea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94669 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'avmedia')
-rw-r--r--avmedia/source/win/framegrabber.cxx2
-rw-r--r--avmedia/source/win/player.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx
index 09f5a6409616..21b5dede6866 100644
--- a/avmedia/source/win/framegrabber.cxx
+++ b/avmedia/source/win/framegrabber.cxx
@@ -50,7 +50,7 @@ namespace avmedia::win {
FrameGrabber::FrameGrabber( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
mxMgr( rxMgr )
{
- ::CoInitialize( nullptr );
+ ::CoInitializeEx( nullptr, COINIT_APARTMENTTHREADED );
}
diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx
index 50323bb80725..8e08d9e53b90 100644
--- a/avmedia/source/win/player.cxx
+++ b/avmedia/source/win/player.cxx
@@ -80,7 +80,7 @@ Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
mbLooping( false ),
mbAddWindow( true )
{
- ::CoInitialize( nullptr );
+ ::CoInitializeEx( nullptr, COINIT_APARTMENTTHREADED );
}