lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-20 11:56:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Enable ffmpeg for Android

Browse Source 
After ffmpeg was removed on Android targets following QTBUG-110172,
this patch enables it after fixing the failing test.

Task-number: QTBUG-110453
Change-Id: I5598a9b72d06af6664455e933129a08192afac15
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit b9c2512748)
This commit is contained in:
Samuel Mira
2023-01-25 10:01:32 +02:00
parent 840e61affe
commit f6d3fc13df
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -181,13 +181,14 @@ elif [ "$os" == "android" ]; then
target_arch=x86_64
sha1="0241fd483c16f4ce53206b911214b06854cdef9d"
url_cached="http://ci-files01-hki.intra.qt.io/input/ffmpeg/android-ffmpeg-x86_64.zip"
target_dir="/opt/android/$ffmpeg_name/ffmpeg-x86_64"
else
target_arch=x86
url_cached="http://ci-files01-hki.intra.qt.io/input/ffmpeg/android-ffmpeg-x86.zip"
sha1="8b254e31411a350edb581bb30e31401866abbe7d"
target_dir="/opt/android/$ffmpeg_name/ffmpeg-x86"
fi
target_dir="/opt/android/$ffmpeg_name"
app_prefix=""
#try install a pre-build