diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-08-10 23:29:03 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2016-08-17 00:01:29 +0200 |
| commit | ae7becfe50cca2f6000342475f52750cab53985c (patch) | |
| tree | a5ed2c5d596e5c65173557cd4675113ea398d51d /package/ffmpeg | |
| parent | 721bcb85132ba5842f61c6204a316d1bf04b3f49 (diff) | |
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 <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/ffmpeg')
| -rw-r--r-- | package/ffmpeg/ffmpeg.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index c42336f80..2b4219a3a 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) |