Skip to content

O
opencv
Commit e93e1ba2 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #11879 from alalek:fix_msmf_32bit

parents 117e97ad b3578710
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
modules/videoio/src/cap_msmf.cpp
View file @ e93e1ba2
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
// MFCreateDXGIDeviceManager() is available since Win8 only. // MFCreateDXGIDeviceManager() is available since Win8 only.
// To avoid OpenCV loading failure on Win7 use dynamic detection of this symbol. // To avoid OpenCV loading failure on Win7 use dynamic detection of this symbol.
// Details: https://github.com/opencv/opencv/issues/11858 // Details: https://github.com/opencv/opencv/issues/11858
typedef HRESULT (*FN_MFCreateDXGIDeviceManager)(UINT *resetToken, IMFDXGIDeviceManager **ppDeviceManager); typedef HRESULT (WINAPI *FN_MFCreateDXGIDeviceManager)(UINT *resetToken, IMFDXGIDeviceManager **ppDeviceManager);
static bool pMFCreateDXGIDeviceManager_initialized = false; static bool pMFCreateDXGIDeviceManager_initialized = false;
static FN_MFCreateDXGIDeviceManager pMFCreateDXGIDeviceManager = NULL; static FN_MFCreateDXGIDeviceManager pMFCreateDXGIDeviceManager = NULL;
static void init_MFCreateDXGIDeviceManager() static void init_MFCreateDXGIDeviceManager()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment