From de278446ba55b9551cdf1f589e2dd44ef0c8796b Mon Sep 17 00:00:00 2001 From: Pavel Dubsky Date: Mon, 24 Nov 2025 16:19:10 +0100 Subject: [PATCH] Update FFmpeg version to n7.1.3 Task-number: QTBUG-142159 Pick-to: 6.10 6.10.2 6.8 6.5 Change-Id: I139e4961185d5a88900ba9582a4f8ce10e7ea4c1 Reviewed-by: Artem Dyomin Reviewed-by: Tim Blechmann Reviewed-by: Elias Toivola (cherry picked from commit 90d17e93a95432fab5f1189f37fbab6586a115a7) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/unix/ffmpeg-installation-utils.sh | 4 ++-- coin/provisioning/common/windows/install-ffmpeg.ps1 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/common/unix/ffmpeg-installation-utils.sh b/coin/provisioning/common/unix/ffmpeg-installation-utils.sh index 1a68e252..38d91d87 100755 --- a/coin/provisioning/common/unix/ffmpeg-installation-utils.sh +++ b/coin/provisioning/common/unix/ffmpeg-installation-utils.sh @@ -3,12 +3,12 @@ # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only ffmpeg_version_default() { - echo "n7.1.2" + echo "n7.1.3" } download_ffmpeg() { local version="${1:-$(ffmpeg_version_default)}" - local sha1="${2:-1e4e937facdbde15943dd093121836bf69f27c7c}" + local sha1="${2:-27051817deec88bed3b9652d49f9127d22268d83}" local ffmpeg_name="FFmpeg-$version" local target_dir="$HOME" diff --git a/coin/provisioning/common/windows/install-ffmpeg.ps1 b/coin/provisioning/common/windows/install-ffmpeg.ps1 index 68abf336..79c25e22 100644 --- a/coin/provisioning/common/windows/install-ffmpeg.ps1 +++ b/coin/provisioning/common/windows/install-ffmpeg.ps1 @@ -7,9 +7,9 @@ # This script will install FFmpeg $msys = "C:\Utils\msys64\usr\bin\bash" -$version="n7.1.2" +$version="n7.1.3" $url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -$sha1="1e4e937facdbde15943dd093121836bf69f27c7c" +$sha1="27051817deec88bed3b9652d49f9127d22268d83" $url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz" $ffmpeg_name="FFmpeg-$version"