From 6bd001d76657bfcfe3cf11efd1256866a03ad329 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 8 Jan 2014 17:12:22 +0100 Subject: swscale: disable ARM code until its build failure with clang/iphone is fixed See: "19:40 Yu Xiaolei Re: [FFmpeg-devel] [PATCH] fix build with gas-preprocessor.pl" Signed-off-by: Michael Niedermayer --- libswscale/arm/Makefile | 6 +++--- libswscale/swscale_unscaled.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'libswscale') diff --git a/libswscale/arm/Makefile b/libswscale/arm/Makefile index 41ff6ff714..8b5a97b54c 100644 --- a/libswscale/arm/Makefile +++ b/libswscale/arm/Makefile @@ -1,4 +1,4 @@ -OBJS += arm/swscale_unscaled.o +# OBJS += arm/swscale_unscaled.o -NEON-OBJS += arm/rgb2yuv_neon_32.o -NEON-OBJS += arm/rgb2yuv_neon_16.o +# NEON-OBJS += arm/rgb2yuv_neon_32.o +# NEON-OBJS += arm/rgb2yuv_neon_16.o diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index 4a0a9f818b..6bcfa3efa7 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -1582,8 +1582,8 @@ void ff_get_unscaled_swscale(SwsContext *c) ff_get_unscaled_swscale_bfin(c); if (ARCH_PPC) ff_get_unscaled_swscale_ppc(c); - if (ARCH_ARM) - ff_get_unscaled_swscale_arm(c); +// if (ARCH_ARM) +// ff_get_unscaled_swscale_arm(c); } -- cgit v1.2.3