[vlc-commits] contrib: ffmepg: disable inline asm for android x86

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu Aug 25 17:29:38 2016 +0200| [53d7b3175b22dbbcb21b4aaf18917e69021e77da] | committer: Thomas Guillem

contrib: ffmepg: disable inline asm for android x86

Because of broken text relocations.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=53d7b3175b22dbbcb21b4aaf18917e69021e77da
---

 contrib/src/ffmpeg/rules.mak | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 6fafe64..2a43121 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -141,8 +141,9 @@ FFMPEGCONF += --target-os=linux --enable-pic
 endif
 
 ifdef HAVE_ANDROID
+# broken text relocations
 ifeq ($(ANDROID_ABI), x86)
-FFMPEGCONF +=  --disable-mmx --disable-mmxext
+FFMPEGCONF +=  --disable-mmx --disable-mmxext --disable-inline-asm
 endif
 ifdef HAVE_NEON
 ifeq ($(ANDROID_ABI), armeabi-v7a)