From 587cbeff145a78d707afca292701804b1d47c4df Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Sat, 2 Jun 2018 14:51:29 +0100
Subject: [PATCH] ffmpeg: cleanup configure

---
 packages/multimedia/ffmpeg/package.mk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/multimedia/ffmpeg/package.mk b/packages/multimedia/ffmpeg/package.mk
index 4d9a4a6157..aadec506e0 100644
--- a/packages/multimedia/ffmpeg/package.mk
+++ b/packages/multimedia/ffmpeg/package.mk
@@ -81,6 +81,12 @@ else
   FFMPEG_FPU="--disable-neon"
 fi
 
+if [ "$TARGET_ARCH" = "x86_64" ]; then
+  FFMPEG_X86ASM="--enable-x86asm"
+else
+  FFMPEG_X86ASM="--disable-x86asm"
+fi
+
 pre_configure_target() {
   cd $PKG_BUILD
   rm -rf .$TARGET_NAME
@@ -161,7 +167,6 @@ configure_target() {
               --enable-encoder=wmav2 \
               --enable-encoder=mjpeg \
               --enable-encoder=png \
-              --disable-decoder=mpeg_xvmc \
               --enable-hwaccels \
               --disable-muxers \
               --enable-muxer=spdif \
@@ -202,7 +207,7 @@ configure_target() {
               --enable-asm \
               --disable-altivec \
               $FFMPEG_FPU \
-              --enable-yasm \
+              $FFMPEG_X86ASM \
               --disable-symver
 }