[vlc-commits] contrib: ffmpeg: fix x86_64 android build

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu Aug 25 18:11:02 2016 +0200| [1cce101a18d37c429c75ccf856e52e2846daf414] | committer: Thomas Guillem

contrib: ffmpeg: fix x86_64 android build

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

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

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 2a43121..a13f9dd 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -145,6 +145,9 @@ ifdef HAVE_ANDROID
 ifeq ($(ANDROID_ABI), x86)
 FFMPEGCONF +=  --disable-mmx --disable-mmxext --disable-inline-asm
 endif
+ifeq ($(ANDROID_ABI), x86_64)
+FFMPEGCONF +=  --disable-mmx --disable-mmxext --disable-inline-asm
+endif
 ifdef HAVE_NEON
 ifeq ($(ANDROID_ABI), armeabi-v7a)
 FFMPEGCONF += --as='gas-preprocessor.pl -as-type clang -arch arm $(CC)'