Update ffmpeg version to n6.0

Checked the basic functionality on macOS, linux, and windows.
To be tested in detail.

Change-Id: I109f52ab33d58088332a3885c83d622815edd22e
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit aed030bb90)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Artem Dyomin
2023-03-06 14:40:27 +01:00
committed by Qt Cherry-pick Bot
parent 29d9e74435
commit f65288d120
2 changed files with 6 additions and 11 deletions

View File

@@ -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"

View File

@@ -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"