From a6b86bf58cbc926b549c3057a5d1c60a7cf4e1d8 Mon Sep 17 00:00:00 2001 From: Paul Dubsky Date: Tue, 1 Apr 2025 14:32:30 +0200 Subject: [PATCH] Update FFmpeg version to n7.1.1 Task-number: QTBUG-134621 Pick-to: 6.8 6.5 Change-Id: I6255f615be533521bf1c3da85b29f96e855197e1 Reviewed-by: Bartlomiej Moskal Reviewed-by: Tim Blechmann (cherry picked from commit 24bba3c8b5455500eab473fff6c70e98076b5d5b) Reviewed-by: Volker Hilsheimer --- 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 26d9484d..9588ca17 100755 --- a/coin/provisioning/common/unix/ffmpeg-installation-utils.sh +++ b/coin/provisioning/common/unix/ffmpeg-installation-utils.sh @@ -3,8 +3,8 @@ # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only download_ffmpeg() { - local version="${1:-n7.1}" - local sha1="${2:-f008a93710a7577e3f85a90f4b632cc615164712}" + local version="${1:-n7.1.1}" + local sha1="${2:-479291e8555fe036ca760f95cea829a21e9b8365}" 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 3fbfd72a..ee8c2f2f 100644 --- a/coin/provisioning/common/windows/install-ffmpeg.ps1 +++ b/coin/provisioning/common/windows/install-ffmpeg.ps1 @@ -6,9 +6,9 @@ # This script will install FFmpeg $msys = "C:\Utils\msys64\usr\bin\bash" -$version="n7.1" +$version="n7.1.1" $url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -$sha1="f008a93710a7577e3f85a90f4b632cc615164712" +$sha1="479291e8555fe036ca760f95cea829a21e9b8365" $url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz" $ffmpeg_name="FFmpeg-$version"