ffmpeg: fix neon support for aarch64
authorBernd Kuhls <bernd.kuhls@t-online.de>
Fri, 14 Apr 2017 09:30:26 +0000 (11:30 +0200)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Fri, 14 Apr 2017 09:41:24 +0000 (11:41 +0200)
ffmpeg ported arm 32-bit NEON code to aarch64 as hard dependency:
http://ffmpeg.org/pipermail/ffmpeg-devel/2016-November/202733.html

Buildroot option BR2_ARM_CPU_HAS_NEON handles only the 32bit case:
https://git.buildroot.net/buildroot/commit/?id=0976cd6cd64a128a2ac921e4f35f0e7cbe306692

For aarch64 we need to make sure to pass --enable-neon in order to
prevent a link error, fixes

http://autobuild.buildroot.net/results/fa4/fa46003249664b1f97f6c18253c84cd3d6fb9cdb/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
package/ffmpeg/ffmpeg.mk

index 059f8320e567d0515c4f5c10c73c106042941206..adc0f5d4241f3aee7de8edc9697997576b9b7d6c 100644 (file)
@@ -432,6 +432,8 @@ FFMPEG_CONF_OPTS += --disable-vfp
 endif
 ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
 FFMPEG_CONF_OPTS += --enable-neon
+else ifeq ($(BR2_aarch64),y)
+FFMPEG_CONF_OPTS += --enable-neon
 else
 FFMPEG_CONF_OPTS += --disable-neon
 endif