update windows ffmpeg to 7.1.1

Signed-off-by: swurl <swurl@swurl.xyz>

.ci/linux/build.sh

@@ -48,7 +48,6 @@ cmake .. -G Ninja \
     -DCMAKE_C_FLAGS="$ARCH_FLAGS" \
     -DYUZU_USE_BUNDLED_VCPKG=OFF \
     -DYUZU_USE_BUNDLED_QT=OFF \
-    -DYUZU_USE_BUNDLED_FFMPEG=OFF \
     -DYUZU_USE_BUNDLED_SDL2=OFF \
     -DYUZU_USE_EXTERNAL_SDL2=ON \
     -DYUZU_TESTS=OFF \

CMakeLists.txt

@@ -41,7 +41,7 @@ CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" "${MSV
 
 option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON)
 
-option(YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" "${WIN32}")
+option(YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" "ON")
 
 option(YUZU_USE_EXTERNAL_VULKAN_HEADERS "Use Vulkan-Headers from externals" ON)
 
@@ -397,6 +397,13 @@ if (ENABLE_SDL2)
     endif()
 endif()
 
+# List of all FFmpeg components required
+set(FFmpeg_COMPONENTS
+    avcodec
+    avfilter
+    avutil
+    swscale)
+
 add_subdirectory(externals)
 
 if (ENABLE_QT)
@@ -460,13 +467,6 @@ function(set_yuzu_qt_components)
     set(YUZU_QT_COMPONENTS ${YUZU_QT_COMPONENTS2} PARENT_SCOPE)
 endfunction(set_yuzu_qt_components)
 
-# List of all FFmpeg components required
-set(FFmpeg_COMPONENTS
-    avcodec
-    avfilter
-    avutil
-    swscale)
-
 if (UNIX AND NOT APPLE AND NOT ANDROID)
     find_package(PkgConfig REQUIRED)
     pkg_check_modules(LIBVA libva)

externals/ffmpeg/CMakeLists.txt

@@ -32,6 +32,7 @@ if (NOT WIN32 AND NOT ANDROID)
     endif()
 
     unset(FFmpeg_LIBRARIES CACHE)
+
     foreach(COMPONENT ${FFmpeg_COMPONENTS})
         set(FFmpeg_${COMPONENT}_PREFIX "${FFmpeg_BUILD_DIR}/lib${COMPONENT}")
         set(FFmpeg_${COMPONENT}_LIB_NAME "lib${COMPONENT}.a")
@@ -254,7 +255,7 @@ elseif(ANDROID)
     set(FFmpeg_INCLUDE_DIR "${FFmpeg_INCLUDE_DIR}" PARENT_SCOPE)
 elseif(WIN32)
     # Use yuzu FFmpeg binaries
-    set(FFmpeg_EXT_NAME "ffmpeg-7.0.3")
+    set(FFmpeg_EXT_NAME "ffmpeg-7.1.1")
     set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}")
     download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "")
     set(FFmpeg_FOUND YES)