From a76800db3e4260674192ff1325c9a84ccc857669 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Wed, 2 Jan 2019 21:51:12 -0500
Subject: [PATCH] contrib: enable x264 on Android

Change-Id: I92ac1e5a7f772d2440adb522622622829b13b869
---
 contrib/src/ffmpeg/rules.mak | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 43674fef56..c7e3389925 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 vpx opus speex
+DEPS_ffmpeg = iconv zlib vpx opus speex x264
 
 FFMPEGCONF = \
 	--cc="$(CC)" \
@@ -65,6 +65,7 @@ FFMPEGCONF += \
 	--enable-libspeex \
 	--enable-libopus \
 	--enable-libvpx \
+	--enable-libx264 \
 	--enable-encoder=libspeex \
 	--enable-decoder=libspeex \
 	--enable-encoder=libopus \
@@ -185,11 +186,6 @@ FFMPEGCONF += \
 endif
 endif
 
-ifndef HAVE_ANDROID
-FFMPEGCONF += --enable-libx264
-DEPS_ffmpeg += x264
-endif
-
 ifdef HAVE_MACOSX
 FFMPEGCONF += \
 	--enable-avfoundation \
-- 
GitLab