From 621198dbbcddb1b4bdf75a5fa99c725089c2cef5 Mon Sep 17 00:00:00 2001
From: philippegorley <philippe.gorley@savoirfairelinux.com>
Date: Mon, 23 Oct 2017 10:33:58 -0400
Subject: [PATCH] android: activate hardware decoding on 32 bits

Hardware decoding for 32 bit platforms was fixed by FFmpeg commit
dd8ffb191fd24f5b783b9722f63019120d61c48c, which in included in the
latest bump.

Change-Id: I1ec4a91ae85902d225938921dee8eaf236f7ef9e
---
 contrib/src/ffmpeg/rules.mak | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 99b0c9dfea..7606c02d44 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -99,10 +99,7 @@ ifdef HAVE_ANDROID
 # Android Linux
 FFMPEGCONF += \
 	--target-os=android \
-	--enable-jni
-# ARM 32 bits has trouble with mediacodec
-ifneq ($(ARCH),arm)
-FFMPEGCONF += \
+	--enable-jni \
 	--enable-mediacodec \
 	--enable-hwaccel=vp8_mediacodec \
 	--enable-hwaccel=h264_mediacodec \
@@ -110,7 +107,6 @@ FFMPEGCONF += \
 	--enable-decoder=vp8_mediacodec \
 	--enable-decoder=h264_mediacodec \
 	--enable-decoder=mpeg4_mediacodec
-endif
 # ASM not working on Android x86 https://trac.ffmpeg.org/ticket/4928
 ifeq ($(ARCH),i386)
 FFMPEGCONF += --disable-asm
-- 
GitLab