qiurui
/
qt5
mirror of https://github.com/qt/qt5.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enable zlib in FFmpeg configuration 

Fixes: QTBUG-103332
Pick-to: 6.10 6.9 6.8 6.5
Change-Id: I87a760edcd4d8a77966ec5a692cb1f1f4242b647
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
This commit is contained in:
Pavel Dubsky 2025-07-22 21:03:45 +02:00
parent d48682bcdf
commit f7af78977c
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
coin/provisioning/common/windows/install-ffmpeg.ps1
View File

@ -2,6 +2,7 @@
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
. "$PSScriptRoot\helpers.ps1" . "$PSScriptRoot\helpers.ps1"
. "$PSScriptRoot\zlib-helpers.ps1"
# This script will install FFmpeg # This script will install FFmpeg
$msys = "C:\Utils\msys64\usr\bin\bash" $msys = "C:\Utils\msys64\usr\bin\bash"
@ -113,6 +114,13 @@ function InstallMsvcFfmpeg {
} }
} }
$zlibPath = GetZlibPathByString -TargetArchitecture $arch
$zlibPath = $zlibPath -replace '\\', '/'
$config += " --enable-zlib"
$config += " --extra-cflags=`"-I$zlibPath`""
$config += " --extra-ldflags=`"-LIBPATH:$zlibPath`""
$result = EnterVSDevShell -HostArch $hostArch -Arch $arch $result = EnterVSDevShell -HostArch $hostArch -Arch $arch
if (-Not $result) { if (-Not $result) {
return $false return $false