jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

android: activate hardware decoding on 32 bits

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

Change-Id: I1ec4a91ae85902d225938921dee8eaf236f7ef9e
This commit is contained in:
philippegorley
2017-10-23 10:33:58 -04:00
committed by Adrien Béraud
parent 9031f167c5
commit 621198dbbc
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/src/ffmpeg/rules.mak
View File

@ -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