Merge remote-tracking branch 'origin/master'

2025-01-14 23:43:50 +08:00
parent 7d0456e85e 820180c9e7
commit 1dc6465f12
91 changed files with 6764 additions and 2374 deletions
--- a/cmake/dependencies/common.cmake
+++ b/cmake/dependencies/common.cmake
@@ -28,7 +28,7 @@ include_directories(SYSTEM ${MINIUPNP_INCLUDE_DIRS})
 # ffmpeg pre-compiled binaries
 if(NOT DEFINED FFMPEG_PREPARED_BINARIES)
    if(WIN32)
-        set(FFMPEG_PLATFORM_LIBRARIES mfplat ole32 strmiids mfuuid vpl)
+        set(FFMPEG_PLATFORM_LIBRARIES mfplat ole32 strmiids mfuuid vpl MinHook)
    elseif(UNIX AND NOT APPLE)
        set(FFMPEG_PLATFORM_LIBRARIES numa va va-drm va-x11 X11)
    endif()