diff --git a/coin/provisioning/common/unix/install-ffmpeg-ios.sh b/coin/provisioning/common/unix/install-ffmpeg-ios.sh index 49889c78..d9637055 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-ios.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-ios.sh @@ -11,8 +11,8 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" version="n7.0" -sha1="042260ec5013eb29c89c13443a0f42cbe6fbceaa" url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" +sha1="042260ec5013eb29c89c13443a0f42cbe6fbceaa" 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 67255e3c..30163b73 100755 --- a/coin/provisioning/common/unix/install-ffmpeg.sh +++ b/coin/provisioning/common/unix/install-ffmpeg.sh @@ -12,7 +12,7 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" version="n7.0" -url_public="https://github.com/FFmpeg/FFmpeg/archive/$version.tar.gz" +url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" sha1="042260ec5013eb29c89c13443a0f42cbe6fbceaa" 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 487e4552..e77417eb 100644 --- a/coin/provisioning/common/windows/install-ffmpeg.ps1 +++ b/coin/provisioning/common/windows/install-ffmpeg.ps1 @@ -6,20 +6,20 @@ # This script will install FFmpeg $msys = "C:\Utils\msys64\usr\bin\bash" -$version = "n7.0" -$ffmpeg_name = "ffmpeg-" + $version; -$sha1 = "CC948A547113469E284CA085B9A236F1ECC50843" +$version="n7.0" +$url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" +$sha1="042260ec5013eb29c89c13443a0f42cbe6fbceaa" +$url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz" +$ffmpeg_name="FFmpeg-$version" -$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" -$download_location = "C:\Windows\Temp\" + $ffmpeg_name + ".zip" +$download_location = "C:\Windows\Temp\$ffmpeg_name.tar.gz" $unzip_location = "C:\" Write-Host "Fetching FFmpeg $version..." Download $url_public $url_cached $download_location Verify-Checksum $download_location $sha1 -Extract-7Zip $download_location $unzip_location +Extract-tar_gz $download_location $unzip_location Remove $download_location function GetFfmpegDefaultConfiguration {