From 657692af77347f650bfa39f24dc7f4427722792a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com> Date: Fri, 14 Jul 2017 09:47:22 -0400 Subject: [PATCH] Revert "android: enable assembly optimizations for x86_64" This reverts commit c1eb117885a661efb236d75ccfbede558fdd194a. Doesn't build. Change-Id: Id1ec839d9cd0d0ba000ef296c459b9c73413e571 --- 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 d6f4255ca8..cd291c74cd 100644 --- a/contrib/src/ffmpeg/rules.mak +++ b/contrib/src/ffmpeg/rules.mak @@ -110,6 +110,9 @@ endif ifeq ($(ARCH),i386) FFMPEGCONF += --disable-asm endif +ifeq ($(ARCH),x86_64) +FFMPEGCONF += --disable-asm +endif else # Desktop Linux FFMPEGCONF += \ -- GitLab