projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a1fe8f7
)
Remove MinCore_Downlevel, replace with Shlwapi
author
Thad House
<thadhouse1@gmail.com>
Wed, 12 Dec 2018 01:06:01 +0000
(17:06 -0800)
committer
Thad House
<thadhouse1@gmail.com>
Wed, 12 Dec 2018 01:06:01 +0000
(17:06 -0800)
On windows 7, MinCore_Downlevel does not work correctly. However, the only API used was QISearch, which can be found in Shlwapi.
Closes #12010
modules/videoio/src/cap_msmf.cpp
patch
|
blob
|
history
diff --git
a/modules/videoio/src/cap_msmf.cpp
b/modules/videoio/src/cap_msmf.cpp
index
9fa84a1
..
3eca95b
100644
(file)
--- a/
modules/videoio/src/cap_msmf.cpp
+++ b/
modules/videoio/src/cap_msmf.cpp
@@
-99,9
+99,7
@@
static void init_MFCreateDXGIDeviceManager()
pMFCreateDXGIDeviceManager_initialized = true;
}
#endif
-#if (WINVER >= 0x0602) // Available since Win 8
-#pragma comment(lib, "MinCore_Downlevel")
-#endif
+#pragma comment(lib, "Shlwapi.lib")
#endif
#include <mferror.h>