From 0de035d6800221758196a0910bf4e89c2d18c64c Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sun, 5 Apr 2026 11:24:38 +0200 Subject: [PATCH] Win: Update ffmpeg to 8.1 --- .ci/build-linux-aarch64.sh | 2 +- .ci/build-linux.sh | 2 +- 3rdparty/ffmpeg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci/build-linux-aarch64.sh b/.ci/build-linux-aarch64.sh index 1fe640809c8d..26fc1dc9d9f7 100755 --- a/.ci/build-linux-aarch64.sh +++ b/.ci/build-linux-aarch64.sh @@ -35,7 +35,7 @@ cmake .. \ -DUSE_SYSTEM_CURL=ON \ -DUSE_SDL=ON \ -DUSE_SYSTEM_SDL=ON \ - -DUSE_SYSTEM_FFMPEG=OFF \ + -DUSE_SYSTEM_FFMPEG=ON \ -DUSE_SYSTEM_OPENCV=ON \ -DUSE_DISCORD_RPC=ON \ -DOpenGL_GL_PREFERENCE=LEGACY \ diff --git a/.ci/build-linux.sh b/.ci/build-linux.sh index 13a9e802f3c2..d9f66f6a0463 100755 --- a/.ci/build-linux.sh +++ b/.ci/build-linux.sh @@ -46,7 +46,7 @@ cmake .. \ -DUSE_SYSTEM_CURL=ON \ -DUSE_SDL=ON \ -DUSE_SYSTEM_SDL=ON \ - -DUSE_SYSTEM_FFMPEG=OFF \ + -DUSE_SYSTEM_FFMPEG=ON \ -DUSE_SYSTEM_OPENCV=ON \ -DUSE_DISCORD_RPC=ON \ -DOpenGL_GL_PREFERENCE=LEGACY \ diff --git a/3rdparty/ffmpeg b/3rdparty/ffmpeg index ce81114ed99e..7de1c1df3032 160000 --- a/3rdparty/ffmpeg +++ b/3rdparty/ffmpeg @@ -1 +1 @@ -Subproject commit ce81114ed99e5510f6cd983f59a1eac9f33bb73c +Subproject commit 7de1c1df3032a2c4fbdc529f5774cc0cdac115fa