lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Coin: Turn on Dynamically linked FFmpeg for Android

Browse Source 
Turn on dynamically linked ffmpeg on Android on all hosts (Linux,
Windows and macOS).

Task-number: QTBUG-122010
Change-Id: Ib3739173bee209ce73e77b75d7b345208da002e4
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit a675a87446)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Bartlomiej Moskal
2024-05-29 11:02:12 +02:00
committed by Qt Cherry-pick Bot
parent c9009d7c7a
commit 13a07d01d5
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/provisioning/common/unix/install-ffmpeg-android.sh
View File

@@ -123,4 +123,4 @@ elif [ "$os" == "android-arm64" ]; then
SetEnvVar "FFMPEG_DIR_ANDROID_ARM64" "$target_dir"
fi
build_ffmpeg_android "$target_arch" "$target_dir"
build_ffmpeg_android "$target_arch" "$target_dir" "yes"

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

@@ -134,7 +134,7 @@ function InstallLlvmMingwFfmpeg {
}
function InstallAndroidArmv7 {
$shared=$false
$shared=$true
$target_toolchain_arch="armv7a-linux-androideabi"
$target_arch="armv7-a"
$target_cpu="armv7-a"