Merge remote-tracking branch 'origin/master'

2025-01-18 14:57:43 +08:00
parent c724d30d51 89f097ae65
commit 2a173239f6
16 changed files with 584 additions and 111 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 MinHook)
+        set(FFMPEG_PLATFORM_LIBRARIES mfplat ole32 strmiids mfuuid vpl)
    elseif(UNIX AND NOT APPLE)
        set(FFMPEG_PLATFORM_LIBRARIES numa va va-drm va-x11 X11)
    endif()