From: Bernd Kuhls Date: Fri, 14 Apr 2017 09:30:26 +0000 (+0200) Subject: ffmpeg: fix neon support for aarch64 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9de0100cf1ef55789d582fce265dd6c536beb6e6;p=buildroot.git ffmpeg: fix neon support for aarch64 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 Signed-off-by: Thomas Petazzoni --- diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 059f8320e5..adc0f5d424 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -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