From a1de7aea70e025a3f0bd860e102feef518443b23 Mon Sep 17 00:00:00 2001 From: Artem Dyomin Date: Tue, 26 Dec 2023 12:43:40 +0100 Subject: [PATCH] Update ffmpeg to n6.1 for Linux, and macOS FFmpeg version was between n6.0 and n6.1 due to some hotfix for having it compilable on CI. Since n6.1 has been released, we should update. Task-number: QTBUG-121441 Pick-to: 6.7 6.6 6.5 dev Change-Id: I0d88599be53748eeb038287abe8aad6c0f189933 Reviewed-by: Jani Heikkinen --- coin/provisioning/common/unix/install-ffmpeg.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/coin/provisioning/common/unix/install-ffmpeg.sh b/coin/provisioning/common/unix/install-ffmpeg.sh index 73204429..f27eb8b1 100755 --- a/coin/provisioning/common/unix/install-ffmpeg.sh +++ b/coin/provisioning/common/unix/install-ffmpeg.sh @@ -11,12 +11,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -# Commit c5039e158d20e85d4d8a2dee3160533d627b839a is the latest one in 6.0 branch. -# When using the latest commit we will also get fix for https://fftrac-bg.ffmpeg.org/ticket/10405 -# Should be changed to official release as soon as possible! -version="c5039e158d20e85d4d8a2dee3160533d627b839a" +version="n6.1" url_public="https://github.com/FFmpeg/FFmpeg/archive/$version.tar.gz" -sha1="4e13a26d3be7ac4d69201a6aa0accd734b24b3c4" +sha1="1feb946476f3076a9b38c97ca0d8b69e1826049c" url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz" ffmpeg_name="FFmpeg-$version"