From ae7becfe50cca2f6000342475f52750cab53985c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 10 Aug 2016 23:29:03 +0200 Subject: [PATCH] ffmpeg: explicitly disable NEON support When BR2_ARM_CPU_HAS_NEON=y, we pass --enable-neon. However, when BR2_ARM_CPU_HAS_NEON is disabled, we don't pass anything. This generally works fine, but turned out to integrate NEON code in ARMv7-M builds (since it's ARMv7, ffmpeg assumed it should enable NEON code). Even though ffmpeg is now disabled for ARMv7-M, it still makes sense to be explicit, and disable NEON support when the CPU doesn't have it. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/ffmpeg/ffmpeg.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index c42336f800..2b4219a3aa 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -437,6 +437,8 @@ FFMPEG_CONF_OPTS += --disable-vfp endif ifeq ($(BR2_ARM_CPU_HAS_NEON),y) FFMPEG_CONF_OPTS += --enable-neon +else +FFMPEG_CONF_OPTS += --disable-neon endif ifeq ($(BR2_MIPS_SOFT_FLOAT),y) -- 2.30.2