diff options
| author | Artem Dyomin <artem.dyomin@qt.io> | 2023-01-09 15:20:20 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-01-18 12:48:15 +0000 |
| commit | 90b66298024e8fee3d896a00628da0d0ac1e0b1c (patch) | |
| tree | b6e7198c4dc1f50b5d43df628073079ef4730224 | |
| parent | bc1cbd7a4d6851caf76176397c08e1f19195667c (diff) | |
Update ffmpeg version to 5.1 for desktop platforms
Some issues have been fixed in ffmpeg 5.1, e.g, with videotoolbox.
So the update at least fixes our playback
of some video formats on macos, e.g. provided in the related bug.
After the update I tested the basic functionality on windows,
linux, macOS, and run CI tests, which are OK.
Task-number: QTBUG-98102
Change-Id: I72f45780e1c3983d6a1941db2b833b78784b90de
Reviewed-by: Samuel Mira <samuel.mira@qt.io>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit 0f8eccdfc548dbb0bcf8ea67b2d1c618fde7239e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rwxr-xr-x | coin/provisioning/common/unix/install-ffmpeg.sh | 4 | ||||
| -rw-r--r-- | coin/provisioning/common/windows/install-ffmpeg.ps1 | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/coin/provisioning/common/unix/install-ffmpeg.sh b/coin/provisioning/common/unix/install-ffmpeg.sh index db119557..e324033d 100755 --- a/coin/provisioning/common/unix/install-ffmpeg.sh +++ b/coin/provisioning/common/unix/install-ffmpeg.sh @@ -68,9 +68,9 @@ version="f0d2ed135c3602670b56a95e0346487730317407" url_public="https://github.com/FFmpeg/FFmpeg/archive/$version.tar.gz" sha1="a429060d07b6d84c849a68741f816a7e91447d12" else -version="n5.0" +version="n5.1" url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -sha1="1a979876463fd81e481d53ceb3cc117f0fce8521" +sha1="1d4283c5ff9e02378893168f55b8672bb30b9176" fi url_cached="http://ci-files01-hki.intra.qt.io/input/ffmpeg/$version.tar.gz" diff --git a/coin/provisioning/common/windows/install-ffmpeg.ps1 b/coin/provisioning/common/windows/install-ffmpeg.ps1 index 4953c774..42fb26d2 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 = "n5.0" +$version = "n5.1" $ffmpeg_name = "ffmpeg-" + $version; -$sha1 = "3F7C6D5264A04BC27BA471D189B0483954820D65" +$sha1 = "9D5AD63032B03922D38F99159728F24C305FC345" $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" |