From dbb28f71d704ca5abd6ea8636ba7cafdb904b5ac Mon Sep 17 00:00:00 2001 From: Ryan Coe Date: Tue, 13 Aug 2013 11:54:11 +0200 Subject: [PATCH] ffmpeg: fix typo in BR2_arm1176jzf_s Signed-off-by: Ryan Coe Signed-off-by: Thomas Petazzoni --- package/multimedia/ffmpeg/ffmpeg.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk index 6223a79d4b..b102af12c2 100644 --- a/package/multimedia/ffmpeg/ffmpeg.mk +++ b/package/multimedia/ffmpeg/ffmpeg.mk @@ -146,12 +146,12 @@ endif 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) +ifeq ($(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf_s),y) FFMPEG_CONF_OPT += --enable-armv6 else FFMPEG_CONF_OPT += --disable-armv6 --disable-armv6t2 endif -ifeq ($(BR2_arm10)$(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf-s)$(BR2_cortex_a5)$(BR2_cortex_a8)$(BR2_cortex_a9)$(BR2_cortex_a15),y) +ifeq ($(BR2_arm10)$(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf_s)$(BR2_cortex_a5)$(BR2_cortex_a8)$(BR2_cortex_a9)$(BR2_cortex_a15),y) FFMPEG_CONF_OPT += --enable-armvfp else FFMPEG_CONF_OPT += --disable-armvfp -- 2.30.2