From b9e5ef42b4f57079ca52391064d63586fa505b70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Fri, 9 Oct 2015 15:54:12 -0400
Subject: [PATCH] contrib: disable x264 on Android

Issue: #78220
Change-Id: Ibc89d02ad226a9ac003ae2adb3a476b3b714d911
---
 contrib/src/libav/rules.mak | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/contrib/src/libav/rules.mak b/contrib/src/libav/rules.mak
index 53e3395794..e0287ed549 100644
--- a/contrib/src/libav/rules.mak
+++ b/contrib/src/libav/rules.mak
@@ -28,13 +28,11 @@ LIBAVCONF += \
 #enable parsers
 LIBAVCONF += \
 		--enable-parser=h263 \
-		--enable-parser=h264 \
 		--enable-parser=mpeg4video \
 		--enable-parser=opus
 
 #librairies
 LIBAVCONF += \
-		--enable-libx264 \
 		--enable-libopus \
 		--enable-libspeex
 
@@ -44,8 +42,6 @@ LIBAVCONF += \
 		--enable-decoder=adpcm_g722 \
 		--enable-encoder=rawvideo \
 		--enable-decoder=rawvideo \
-		--enable-encoder=libx264 \
-		--enable-decoder=h264 \
 		--enable-encoder=pcm_alaw \
 		--enable-decoder=pcm_alaw \
 		--enable-encoder=pcm_mulaw \
@@ -76,15 +72,19 @@ LIBAVCONF += \
 # Linux
 ifndef HAVE_ANDROID
 LIBAVCONF += \
+		--enable-parser=h264 \
+		--enable-libx264 \
+		--enable-encoder=libx264 \
+		--enable-decoder=h264 \
 		--enable-parser=vp8 \
 		--enable-libvpx \
 		--enable-encoder=libvpx_vp8 \
 		--enable-decoder=vp8
 endif
 
-DEPS_libav = zlib x264 opus speex
+DEPS_libav = zlib opus speex
 ifndef HAVE_ANDROID
-DEPS_libav += vpx $(DEPS_vpx)
+DEPS_libav += vpx x264 $(DEPS_vpx)
 endif
 
 ifdef HAVE_CROSS_COMPILE
-- 
GitLab