From 3535412855b85cb623aaf44958326af3c5bd5ab4 Mon Sep 17 00:00:00 2001
From: Branden Archer <b.m.archer4@gmail.com>
Date: Sat, 31 Mar 2018 16:27:49 -0400
Subject: [PATCH] Disable asm for x86 ffmpeg

The assembly in ffmpeg on x86 has text relocations
which is rejected on later Android systems.
---
 ffmpeg_build.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ffmpeg_build.sh b/ffmpeg_build.sh
index efa09b5..3c987f7 100755
--- a/ffmpeg_build.sh
+++ b/ffmpeg_build.sh
@@ -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'
@@ -40,7 +47,8 @@ make clean
 --disable-ffplay \
 --enable-ffprobe \
 --enable-gpl \
---enable-yasm \
+${ASM_OPTION} \
+${YASM_OPTION} \
 --disable-doc \
 --disable-shared \
 --enable-static \