From 3300e00ffb4a166a7f3f27eb759c5d73df405cba Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 21 Oct 2014 22:26:50 +0200 Subject: [PATCH] ffmpeg: fix ARM condition for --{enable, disable}-vfp As noted by Arnout, not all ARMv6 have the VFP FPU, therefore instead of using a condition on ARMv6 or ARMv7-A, this commit changes to use a condition on BR2_ARM_CPU_HAS_VFPV2. Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" --- package/ffmpeg/ffmpeg.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 349bac9bf3..0990f1878a 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -285,7 +285,7 @@ FFMPEG_CONF_OPTS += --enable-armv6 else FFMPEG_CONF_OPTS += --disable-armv6 --disable-armv6t2 endif -ifeq ($(BR2_ARM_CPU_ARMV6)$(BR2_ARM_CPU_ARMV7A),y) +ifeq ($(BR2_ARM_CPU_HAS_VFPV2),y) FFMPEG_CONF_OPTS += --enable-vfp else FFMPEG_CONF_OPTS += --disable-vfp -- 2.30.2