[vlc-commits] contrib: x264: fix typo when disabling asm on Android x86*

[Thomas Guillem]

vlc/vlc-3.0 | branch: master | Thomas Guillem <thomas at gllm.fr> | Mon Jan 22 17:45:59 2018 +0100| [554c7b545c9a14dccd9f7cf8446dfb8a4ed3f51c] | committer: Thomas Guillem

contrib: x264: fix typo when disabling asm on Android x86*

(cherry picked from commit f87d29bf48b27f112f8d13be09bb4a3cb49d79a9)
Signed-off-by: Thomas Guillem <thomas at gllm.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=554c7b545c9a14dccd9f7cf8446dfb8a4ed3f51c
---

 contrib/src/x264/rules.mak | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/src/x264/rules.mak b/contrib/src/x264/rules.mak
index b050115cd4..9d7e7a657f 100644
--- a/contrib/src/x264/rules.mak
+++ b/contrib/src/x264/rules.mak
@@ -41,10 +41,10 @@ X264CONF += --cross-prefix="$(HOST)-"
 ifdef HAVE_ANDROID
 # broken text relocations
 ifeq ($(ANDROID_ABI), x86)
-FFMPEGCONF +=  --disable-asm
+X264CONF += --disable-asm
 endif
 ifeq ($(ANDROID_ABI), x86_64)
-FFMPEGCONF +=  --disable-asm
+X264CONF += --disable-asm
 endif
 endif
 endif