mirror of
git://code.qt.io/qt/qt5.git
synced 2026-04-27 07:06:33 +08:00
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 <lars@knoll.priv.no>
This commit is contained in:
@@ -11,9 +11,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
|
|||||||
# shellcheck source=../unix/SetEnvVar.sh
|
# shellcheck source=../unix/SetEnvVar.sh
|
||||||
source "${BASH_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"
|
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"
|
url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
|
||||||
ffmpeg_name="FFmpeg-$version"
|
ffmpeg_name="FFmpeg-$version"
|
||||||
|
|
||||||
|
|||||||
@@ -10,8 +10,8 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
|
|||||||
# shellcheck source=../unix/SetEnvVar.sh
|
# shellcheck source=../unix/SetEnvVar.sh
|
||||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||||
|
|
||||||
version="n6.1"
|
version="n6.1.1"
|
||||||
sha1="1feb946476f3076a9b38c97ca0d8b69e1826049c"
|
sha1="59e0c3c4cc48e9c60073495f8c045329bb21f446"
|
||||||
url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
|
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"
|
url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
|
||||||
ffmpeg_name="FFmpeg-$version"
|
ffmpeg_name="FFmpeg-$version"
|
||||||
|
|||||||
@@ -11,9 +11,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
|
|||||||
# shellcheck source=../unix/SetEnvVar.sh
|
# shellcheck source=../unix/SetEnvVar.sh
|
||||||
source "${BASH_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"
|
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"
|
url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
|
||||||
ffmpeg_name="FFmpeg-$version"
|
ffmpeg_name="FFmpeg-$version"
|
||||||
|
|
||||||
|
|||||||
@@ -6,9 +6,9 @@
|
|||||||
# This script will install FFmpeg
|
# This script will install FFmpeg
|
||||||
$msys = "C:\Utils\msys64\usr\bin\bash"
|
$msys = "C:\Utils\msys64\usr\bin\bash"
|
||||||
|
|
||||||
$version = "n6.1"
|
$version = "n6.1.1"
|
||||||
$ffmpeg_name = "ffmpeg-" + $version;
|
$ffmpeg_name = "ffmpeg-" + $version;
|
||||||
$sha1 = "3B4A853266BE923994256B2E4B41CB002E1D63D8"
|
$sha1 = "7AECCED8A0366BE407329B4E176167534233DA12"
|
||||||
|
|
||||||
$url_cached = "https://ci-files01-hki.ci.qt.io/input/ffmpeg/" + $version + ".zip"
|
$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"
|
$url_public = "https://github.com/FFmpeg/FFmpeg/archive/refs/tags/" +$version + ".zip"
|
||||||
|
|||||||
Reference in New Issue
Block a user