external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Merge branch '4.0release' into develop

Browse source
This commit is contained in:
winlin 2022-06-17 07:13:37 +08:00
commit 82efa564e4
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
trunk/auto/depends.sh
View file

@ -691,11 +691,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"