From a52424ae6431dbc6da9d2e6f274009dd14328ced Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Wed, 9 May 2018 17:58:27 -0400
Subject: [PATCH] contrib: don't build x264 on Android

Change-Id: Ie1c2699f547c78a8c1840ee48f23668848cd13b8
---
 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 fbe1e581e8..a4674de914 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -7,7 +7,7 @@ ifeq ($(call need_pkg,"libavutil >= 55.75.100 libavcodec >= 57.106.101 libavform
 PKGS_FOUND += ffmpeg
 endif
 
-DEPS_ffmpeg = iconv zlib x264 vpx opus speex
+DEPS_ffmpeg = iconv zlib vpx opus speex
 
 FFMPEGCONF = \
 	--cc="$(CC)" \
@@ -129,6 +129,7 @@ endif
 
 ifndef HAVE_ANDROID
 FFMPEGCONF += --enable-libx264
+DEPS_ffmpeg += x264
 endif
 
 ifdef HAVE_MACOSX
-- 
GitLab