[vlc-commits] Contrib: FFmpeg, disable Linux perf because it fails on Android

[Jean-Baptiste Kempf]

vlc/vlc-3.0 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Dec  5 17:16:25 2017 +0100| [199747d9c8f7ff4fa3a962a7d3341934dbe97cd5] | committer: Hugo Beauzée-Luyssen

Contrib: FFmpeg, disable Linux perf because it fails on Android

(cherry picked from commit 949fdc703a3451a7c1d201ba964a7821c0d4f3cd)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

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

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

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 375f48df1e..4afb87af7c 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -39,7 +39,8 @@ FFMPEGCONF += \
 	--disable-swresample \
 	--disable-iconv \
 	--disable-avisynth \
-	--disable-nvenc
+	--disable-nvenc \
+	--disable-linux-perf
 ifdef HAVE_DARWIN_OS
 FFMPEGCONF += \
 	--disable-videotoolbox