Просмотр исходного кода

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>
Thomas Petazzoni 9 лет назад
Родитель
Сommit
ae7becfe50
1 измененных файлов с 2 добавлено и 0 удалено
  1. 2 0
      package/ffmpeg/ffmpeg.mk

+ 2 - 0
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)