diff options
| author | Artem Dyomin <artem.dyomin@qt.io> | 2024-02-19 17:36:24 +0100 |
|---|---|---|
| committer | Artem Dyomin <artem.dyomin@qt.io> | 2024-02-23 07:51:58 +0000 |
| commit | 708ffa68a709cb39d1e3376fc5c5a34942a4efd0 (patch) | |
| tree | 5e79de18866b6b008663adccf6e75bf942d6d4b8 | |
| parent | c71b6a534313c27fd4d70507c48e870da5213337 (diff) | |
Update ffmpeg: explicitly refer to the latest release 6.1.1
Pick-to: 6.6 6.5
Change-Id: I231c5cdc6155de0d1ea98220a90ecc0f910b34d6
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit 45220efb3a235ef0962a8ba1712fc94349dae76b)
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
| -rwxr-xr-x | coin/provisioning/common/unix/install-ffmpeg-android.sh | 4 | ||||
| -rwxr-xr-x | coin/provisioning/common/unix/install-ffmpeg.sh | 4 | ||||
| -rw-r--r-- | coin/provisioning/common/windows/install-ffmpeg.ps1 | 4 |
3 files changed, 6 insertions, 6 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.sh b/coin/provisioning/common/unix/install-ffmpeg.sh index 9b90e8b4..5b906fb2 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 3d08bc99..dfc3ae06 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" |