From d9352ec43bb2199b2186e3403632b74278c7d2eb Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 15 Jun 2022 21:13:49 +0800 Subject: [PATCH] Disable all asm for FFmpeg, to compatible with ARM CPU. --- trunk/auto/depends.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 490e28ddcb..cd29cd0b23 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -680,11 +680,8 @@ if [[ $SRS_FFMPEG_FIT == YES ]]; then FFMPEG_CONFIGURE="env PKG_CONFIG_PATH=$(cd ${SRS_OBJS}/${SRS_PLATFORM} && pwd)/opus/lib/pkgconfig ./configure" fi - # If disable nasm, disable all ASMs. - nasm -v >/dev/null 2>&1 && NASM_BIN_OK=YES - if [[ $NASM_BIN_OK != YES || $SRS_NASM == NO || $SRS_CROSS_BUILD == YES ]]; then - FFMPEG_OPTIONS="--disable-asm --disable-x86asm --disable-inline-asm" - fi + # Disable all asm for FFmpeg, to compatible with ARM CPU. + FFMPEG_OPTIONS="--disable-asm --disable-x86asm --disable-inline-asm" # Only build static libraries if no shared FFmpeg. if [[ $SRS_SHARED_FFMPEG == YES ]]; then FFMPEG_OPTIONS="$FFMPEG_OPTIONS --enable-shared"