aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtem Dyomin <artem.dyomin@qt.io>2023-12-26 12:32:18 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2024-02-11 17:11:51 +0000
commit695067da765656831fc81b264127b16bae395d37 (patch)
tree109a01d62dd16e700f2f455844290e7be053d94b
parentf63d9a4ef7bf5a1dd3d5922c520b5ce7802af7c8 (diff)
Update ffmpeg n6.0 -> n6.1 on Windows
The update will go tohether with dynamic ffmpeg build on Windows. Pick-to: 6.5 Change-Id: I7a72d4009c8a8e4030899b526bad9cfedd6f45a7 Reviewed-by: Lars Knoll <lars@knoll.priv.no> Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io> (cherry picked from commit 483694d725177c28d58d1ac4a94c1a6ae4ddeaea) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 1cf5b24dc2e3b263a3fc44dffa67b1fe1640099c)
-rw-r--r--coin/provisioning/common/windows/install-ffmpeg.ps14
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/provisioning/common/windows/install-ffmpeg.ps1 b/coin/provisioning/common/windows/install-ffmpeg.ps1
index fa62c7ae..0f801e6b 100644
--- a/coin/provisioning/common/windows/install-ffmpeg.ps1
+++ b/coin/provisioning/common/windows/install-ffmpeg.ps1
@@ -42,9 +42,9 @@
# This script will install FFmpeg
$msys = "C:\Utils\msys64\usr\bin\bash"
-$version = "n6.0"
+$version = "n6.1"
$ffmpeg_name = "ffmpeg-" + $version;
-$sha1 = "5DDDE739FF966A7EEE810D65D7290860A52709D7"
+$sha1 = "3B4A853266BE923994256B2E4B41CB002E1D63D8"
$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"