Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable asm for x86 ffmpeg #2

Merged
merged 1 commit into from
Apr 1, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion ffmpeg_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,19 @@

pushd ffmpeg

ASM_OPTION=""
YASM_OPTION="--enable-yasm"

case $1 in
armeabi-v7a | armeabi-v7a-neon)
CPU='cortex-a8'
;;
x86)
CPU='i686'
# Some assembly has text relocations, and cannot execute on
# later Android systems.
ASM_OPTION="--disable-asm"
YASM_OPTION="--disable-yasm"
;;
arm64)
CPU='cortex-a57'
Expand Down Expand Up @@ -40,7 +47,8 @@ make clean
--disable-ffplay \
--enable-ffprobe \
--enable-gpl \
--enable-yasm \
${ASM_OPTION} \
${YASM_OPTION} \
--disable-doc \
--disable-shared \
--enable-static \
Expand Down