Skip to content
This repository was archived by the owner on Apr 21, 2025. It is now read-only.

Commit 6eaadd1

Browse files
committed
reorganise android cflags for x264
1 parent f0f16b7 commit 6eaadd1

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

scripts/android/x264.sh

+7-5
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ DEBUG_OPTIONS=""
66
case ${ARCH} in
77
x86)
88

9-
# please note that asm is disabled
10-
# enabling asm for x86 causes text relocations in libavfilter.so
9+
# ENABLING ASM FOR X86 CAUSES TEXT RELOCATIONS IN libavfilter.so
1110
ASM_OPTIONS="--disable-asm"
1211
;;
1312
x86-64)
@@ -18,9 +17,12 @@ x86-64)
1817

1918
export AS="$(command -v nasm)"
2019

21-
# WORKAROUND TO ENABLE X86 ASM
22-
# https://github.com/android-ndk/ndk/issues/693
23-
export CFLAGS="${CFLAGS} -mno-stackrealign"
20+
if [[ ${API} -lt 24 ]]; then
21+
22+
# WORKAROUND TO ENABLE X86 ASM ON API LEVEL < 24
23+
# https://github.com/android-ndk/ndk/issues/693
24+
export CFLAGS="${CFLAGS} -mno-stackrealign"
25+
fi
2426
;;
2527
esac
2628
if [[ -n ${FFMPEG_KIT_DEBUG} ]]; then

0 commit comments

Comments
 (0)