From 45220efb3a235ef0962a8ba1712fc94349dae76b Mon Sep 17 00:00:00 2001 From: Artem Dyomin Date: Mon, 19 Feb 2024 17:36:24 +0100 Subject: [PATCH] Update ffmpeg: explicitly refer to the latest release 6.1.1 Pick-to: 6.7 6.6 6.5 Change-Id: I231c5cdc6155de0d1ea98220a90ecc0f910b34d6 Reviewed-by: Lars Knoll --- 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 573fcc64..05d0b681 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="n6.1" +version="n6.1.1" url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -sha1="1feb946476f3076a9b38c97ca0d8b69e1826049c" +sha1="59e0c3c4cc48e9c60073495f8c045329bb21f446" 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 88f707dd..d3d59849 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-ios.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-ios.sh @@ -10,8 +10,8 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="n6.1" -sha1="1feb946476f3076a9b38c97ca0d8b69e1826049c" +version="n6.1.1" +sha1="59e0c3c4cc48e9c60073495f8c045329bb21f446" url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" 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 fdabfe1d..541bec13 100755 --- a/coin/provisioning/common/unix/install-ffmpeg.sh +++ b/coin/provisioning/common/unix/install-ffmpeg.sh @@ -11,9 +11,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="n6.1" +version="n6.1.1" url_public="https://github.com/FFmpeg/FFmpeg/archive/$version.tar.gz" -sha1="1feb946476f3076a9b38c97ca0d8b69e1826049c" +sha1="59e0c3c4cc48e9c60073495f8c045329bb21f446" 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 ced26144..2ac93e7d 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 = "n6.1" +$version = "n6.1.1" $ffmpeg_name = "ffmpeg-" + $version; -$sha1 = "3B4A853266BE923994256B2E4B41CB002E1D63D8" +$sha1 = "7AECCED8A0366BE407329B4E176167534233DA12" $url_cached = "https://ci-files01-hki.ci.qt.io/input/ffmpeg/" + $version + ".zip" $url_public = "https://github.com/FFmpeg/FFmpeg/archive/refs/tags/" +$version + ".zip"