Browse Source

libdshowcapture: Add FindPin, RGB24, & use CMake instead of pragma

This updates the libdshowcapture submodule to the latest commit.
This also changes win-dshow CMakeList to ensure compatibility.

Full commit list:
 - Add support of RGB24 format
 - CMake: Add Win32 libs instead of pragma directives.
 - Implement FindPin
 - Simplify error handling
 - Fix log level of DebugHR
 - Use default constructor instead of empty function
 - Use std::move instead of copy where appropriate
 - Mark some strings as const
Matt Gajownik 4 years ago
parent
commit
9c01b1ecc8

+ 2 - 0
plugins/win-dshow/CMakeLists.txt

@@ -130,8 +130,10 @@ add_library(win-dshow MODULE
 	${libdshowcapture_HEADERS})
 target_link_libraries(win-dshow
 	libobs
+	setupapi
 	strmiids
 	ksuser
+	winmm
 	wmcodecdspuuid
 	w32-pthreads
 	${FFMPEG_LIBRARIES})

+ 1 - 1
plugins/win-dshow/libdshowcapture

@@ -1 +1 @@
-Subproject commit 0d4211029864ef89f80b79ba297df80c4072d1e2
+Subproject commit 5ac25cba2e90e617293c373bcc3ce59e46197bef

+ 1 - 0
plugins/win-dshow/virtualcam-module/CMakeLists.txt

@@ -72,6 +72,7 @@ add_library(obs-virtualcam-module MODULE
 	${obs-virtualcam-module_SOURCES}
 	${obs-virtualcam-module_HEADERS})
 target_link_libraries(obs-virtualcam-module
+	setupapi
 	winmm
 	strmiids
 	gdiplus