Skip to content
Snippets Groups Projects
Commit 621198db authored by Philippe Gorley's avatar Philippe Gorley Committed by Adrien Béraud
Browse files

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
parent 9031f167
No related branches found
No related tags found
No related merge requests found
...@@ -99,10 +99,7 @@ ifdef HAVE_ANDROID ...@@ -99,10 +99,7 @@ ifdef HAVE_ANDROID
# Android Linux # Android Linux
FFMPEGCONF += \ FFMPEGCONF += \
--target-os=android \ --target-os=android \
--enable-jni --enable-jni \
# ARM 32 bits has trouble with mediacodec
ifneq ($(ARCH),arm)
FFMPEGCONF += \
--enable-mediacodec \ --enable-mediacodec \
--enable-hwaccel=vp8_mediacodec \ --enable-hwaccel=vp8_mediacodec \
--enable-hwaccel=h264_mediacodec \ --enable-hwaccel=h264_mediacodec \
...@@ -110,7 +107,6 @@ FFMPEGCONF += \ ...@@ -110,7 +107,6 @@ FFMPEGCONF += \
--enable-decoder=vp8_mediacodec \ --enable-decoder=vp8_mediacodec \
--enable-decoder=h264_mediacodec \ --enable-decoder=h264_mediacodec \
--enable-decoder=mpeg4_mediacodec --enable-decoder=mpeg4_mediacodec
endif
# ASM not working on Android x86 https://trac.ffmpeg.org/ticket/4928 # ASM not working on Android x86 https://trac.ffmpeg.org/ticket/4928
ifeq ($(ARCH),i386) ifeq ($(ARCH),i386)
FFMPEGCONF += --disable-asm FFMPEGCONF += --disable-asm
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment