[vlc-commits] contrib: ffmpeg: Fix NaCL build

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon Oct  2 18:18:25 2017 +0200| [d102a4ff6b66f23d0a7bbb00e6484a00b4b907b8] | committer: Hugo Beauzée-Luyssen

contrib: ffmpeg: Fix NaCL build

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

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

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index fc68f815a0..434e4d3e90 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -214,6 +214,10 @@ endif
 FFMPEGCONF += --target-os=sunos --enable-pic
 endif
 
+ifdef HAVE_NACL
+FFMPEGCONF+=--disable-inline-asm --disable-asm --target-os=linux
+endif
+
 # Build
 PKGS += ffmpeg
 ifeq ($(call need_pkg,"libavcodec >= $(FFMPEG_LAVC_MIN) libavformat >= 53.21.0 libswscale"),)