Update FFmpeg and KDDockWidgets versions

孙羽 · 孙羽 · commit d0d1fb262192 · 2026-02-24T20:37:22.000+08:00
Upgrade FFmpeg to version 6.0 and adjust the required DLLs accordingly. Also, set KDDockWidgets to use Qt6.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -251,7 +251,7 @@ list(APPEND OLIVE_LIBRARIES
 list(APPEND OLIVE_LIBRARIES OfxHost)
 
 # Link FFmpeg
-find_package(FFMPEG 8.0 REQUIRED
+find_package(FFMPEG 6.0 REQUIRED
   COMPONENTS
   avutil
   avcodec
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -204,7 +204,7 @@ if (WIN32)
   # DLLs to copy from MSYS2 (common dependencies)
   set(_msys2_dlls
     # FFmpeg
-    avcodec-63.dll avformat-63.dll avutil-59.dll avfilter-12.dll
+    avcodec-61.dll avformat-61.dll avutil-59.dll avfilter-10.dll
     swscale-8.dll swresample-5.dll
     # OpenImageIO
     OpenImageIO.dll OpenImageIO_Util.dll
diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
@@ -19,5 +19,5 @@
 add_subdirectory(core EXCLUDE_FROM_ALL)
 
 set(KDDockWidgets_STATIC ON CACHE INTERNAL "Force KDDockWidgets to build statically")
-set(KDDockWidgets_QT6 ${BUILD_QT6} CACHE INTERNAL "Conform KDDockWidgets' Qt 6 setting to ours")
+set(KDDockWidgets_QT6 ON CACHE INTERNAL "Use Qt6 for KDDockWidgets")
 add_subdirectory(KDDockWidgets EXCLUDE_FROM_ALL)
diff --git a/ext/core b/ext/core
@@ -1 +1 @@
-Subproject commit 6ba0a114e8b347fc32914bfe416e40c305590e6f
+Subproject commit d26adb260581e5120a6566fec4d267546c810e47
diff --git a/tests/gtest/CMakeLists.txt b/tests/gtest/CMakeLists.txt
@@ -127,7 +127,7 @@ if (WIN32)
     # DLLs to copy from MSYS2
     set(_msys2_dlls
       # FFmpeg
-      avcodec-63.dll avformat-63.dll avutil-59.dll avfilter-12.dll
+      avcodec-61.dll avformat-61.dll avutil-59.dll avfilter-10.dll
       swscale-8.dll swresample-5.dll
       # OpenImageIO
       OpenImageIO.dll OpenImageIO_Util.dll
