diff options
| author | Artem Dyomin <artem.dyomin@qt.io> | 2023-03-06 14:40:27 +0100 |
|---|---|---|
| committer | Artem Dyomin <artem.dyomin@qt.io> | 2023-04-15 18:10:47 +0000 |
| commit | aed030bb907a2448a3b2ffb5ec78fb7cbd0405a0 (patch) | |
| tree | 119d9c8000fe27b3fb36227484a2cba7989ba49e | |
| parent | 967bdc47ab1a4de01dd553d27ae2f565662f9f99 (diff) | |
| download | qt5-aed030bb907a2448a3b2ffb5ec78fb7cbd0405a0.tar.gz | |
Update ffmpeg version to n6.0
Checked the basic functionality on macOS, linux, and windows.
To be tested in detail.
Pick-to: 6.5
Change-Id: I109f52ab33d58088332a3885c83d622815edd22e
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
| -rwxr-xr-x | coin/provisioning/common/unix/install-ffmpeg.sh | 13 | ||||
| -rw-r--r-- | coin/provisioning/common/windows/install-ffmpeg.ps1 | 4 |
2 files changed, 6 insertions, 11 deletions
diff --git a/coin/provisioning/common/unix/install-ffmpeg.sh b/coin/provisioning/common/unix/install-ffmpeg.sh index ad5fda4d..bd3d0cc1 100755 --- a/coin/provisioning/common/unix/install-ffmpeg.sh +++ b/coin/provisioning/common/unix/install-ffmpeg.sh @@ -62,16 +62,11 @@ function SourceEnvVar { fi } -if [ "$os" == "android" ]; -then -version="f0d2ed135c3602670b56a95e0346487730317407" -url_public="https://github.com/FFmpeg/FFmpeg/archive/$version.tar.gz" -sha1="a429060d07b6d84c849a68741f816a7e91447d12" -else -version="n5.1" + +version="n6.0" url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -sha1="1d4283c5ff9e02378893168f55b8672bb30b9176" -fi +sha1="78435ec71cc2227017a99c030e858719b8c7c74d" + url_cached="http://ci-files01-hki.intra.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 3bca2520..9a76913e 100644 --- a/coin/provisioning/common/windows/install-ffmpeg.ps1 +++ b/coin/provisioning/common/windows/install-ffmpeg.ps1 @@ -42,9 +42,9 @@ # This script will install FFmpeg $msys = "C:\Utils\msys64\usr\bin\bash" -$version = "n5.1" +$version = "n6.0" $ffmpeg_name = "ffmpeg-" + $version; -$sha1 = "9D5AD63032B03922D38F99159728F24C305FC345" +$sha1 = "5DDDE739FF966A7EEE810D65D7290860A52709D7" $url_cached = "http://ci-files01-hki.intra.qt.io/input/ffmpeg/" + $version + ".zip" $url_public = "https://github.com/FFmpeg/FFmpeg/archive/refs/tags/" +$version + ".zip" |