From 22b3565849350cf0bd5bce1a117fa04b565402b9 Mon Sep 17 00:00:00 2001 From: Pavel Dubsky Date: Thu, 3 Oct 2024 12:54:29 +0200 Subject: [PATCH] Update FFmpeg version to n7.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-129510 Pick-to: 6.8 6.5 Change-Id: I15a801c0c0568b26486e5bb2065a1d0d1d151951 Reviewed-by: Jøger Hansegård Reviewed-by: Artem Dyomin Reviewed-by: Tero Heikkinen (cherry picked from commit 154b41a26012057b78c77252513067122238e66e) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/unix/install-ffmpeg-android.sh | 4 ++-- coin/provisioning/common/unix/install-ffmpeg-ios.sh | 4 ++-- coin/provisioning/common/unix/install-ffmpeg.sh | 4 ++-- coin/provisioning/common/windows/install-ffmpeg.ps1 | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/coin/provisioning/common/unix/install-ffmpeg-android.sh b/coin/provisioning/common/unix/install-ffmpeg-android.sh index 9eab75d8..66feaf2e 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-android.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-android.sh @@ -11,9 +11,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="n7.0.2" +version="n7.1" url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0" +sha1="f008a93710a7577e3f85a90f4b632cc615164712" url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz" ffmpeg_name="FFmpeg-$version" diff --git a/coin/provisioning/common/unix/install-ffmpeg-ios.sh b/coin/provisioning/common/unix/install-ffmpeg-ios.sh index 21e4d7d8..798e547b 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-ios.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-ios.sh @@ -10,9 +10,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="n7.0.2" +version="n7.1" url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0" +sha1="f008a93710a7577e3f85a90f4b632cc615164712" url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz" ffmpeg_name="FFmpeg-$version" diff --git a/coin/provisioning/common/unix/install-ffmpeg.sh b/coin/provisioning/common/unix/install-ffmpeg.sh index 6d20f9d5..43e5820a 100755 --- a/coin/provisioning/common/unix/install-ffmpeg.sh +++ b/coin/provisioning/common/unix/install-ffmpeg.sh @@ -17,9 +17,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="n7.0.2" +version="n7.1" url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0" +sha1="f008a93710a7577e3f85a90f4b632cc615164712" url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz" ffmpeg_name="FFmpeg-$version" diff --git a/coin/provisioning/common/windows/install-ffmpeg.ps1 b/coin/provisioning/common/windows/install-ffmpeg.ps1 index f2c36417..e960b076 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.0.2" +$version="n7.1" $url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -$sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0" +$sha1="f008a93710a7577e3f85a90f4b632cc615164712" $url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz" $ffmpeg_name="FFmpeg-$version"