mirror of https://github.com/qt/qt5.git
Update FFmpeg version to n7.0
Fixes: QTBUG-124482 Pick-to: 6.5 Change-Id: I69727981344d935151f19148960c711b65cb2307 Reviewed-by: Artem Dyomin <artem.dyomin@qt.io> Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io> (cherry picked from commiteb8bbfe971
) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commitd4046310f8
) Reviewed-by: Liang Qi <liang.qi@qt.io>
This commit is contained in:
parent
1c5205fa0d
commit
bc854ea729
|
@ -11,9 +11,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
|
|||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
version="n6.1.1"
|
||||
version="n7.0"
|
||||
url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
|
||||
sha1="59e0c3c4cc48e9c60073495f8c045329bb21f446"
|
||||
sha1="042260ec5013eb29c89c13443a0f42cbe6fbceaa"
|
||||
url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
|
||||
ffmpeg_name="FFmpeg-$version"
|
||||
|
||||
|
|
|
@ -11,9 +11,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
|
|||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
version="n6.1.1"
|
||||
version="n7.0"
|
||||
url_public="https://github.com/FFmpeg/FFmpeg/archive/$version.tar.gz"
|
||||
sha1="59e0c3c4cc48e9c60073495f8c045329bb21f446"
|
||||
sha1="042260ec5013eb29c89c13443a0f42cbe6fbceaa"
|
||||
url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
|
||||
ffmpeg_name="FFmpeg-$version"
|
||||
|
||||
|
|
|
@ -6,9 +6,9 @@
|
|||
# This script will install FFmpeg
|
||||
$msys = "C:\Utils\msys64\usr\bin\bash"
|
||||
|
||||
$version = "n6.1.1"
|
||||
$version = "n7.0"
|
||||
$ffmpeg_name = "ffmpeg-" + $version;
|
||||
$sha1 = "7AECCED8A0366BE407329B4E176167534233DA12"
|
||||
$sha1 = "CC948A547113469E284CA085B9A236F1ECC50843"
|
||||
|
||||
$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"
|
||||
|
|
Loading…
Reference in New Issue