From 383932277e91f87bbcf473758452a5b5dec68c4d Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 4 Apr 2013 07:29:48 +0000 Subject: ffmpeg: adjust ARM optimizations We no longer support ARM less than v3 so kill dead code. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/multimedia/ffmpeg/ffmpeg.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/multimedia') diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk index b018ea077..2e88b6b87 100644 --- a/package/multimedia/ffmpeg/ffmpeg.mk +++ b/package/multimedia/ffmpeg/ffmpeg.mk @@ -136,7 +136,7 @@ endif # Explicitly disable everything that doesn't match for ARM # FFMPEG "autodetects" by compiling an extended instruction via AS # This works on compilers that aren't built for generic by default -ifeq ($(BR2_generic_arm)$(BR2_arm7tdmi)$(BR2_arm610)$(BR2_arm710)$(BR2_arm720t)$(BR2_arm920t)$(BR2_arm922t),y) +ifeq ($(BR2_arm7tdmi)$(BR2_arm720t)$(BR2_arm920t)$(BR2_arm922t)$(BR2_strongarm)$(BR2_fa526),y) FFMPEG_CONF_OPT += --disable-armv5te endif ifeq ($(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf-s),y) -- cgit v1.2.3