diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-08 17:12:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-12 19:58:38 +0100 |
| commit | 6bd001d76657bfcfe3cf11efd1256866a03ad329 (patch) | |
| tree | fa75359d536ea8f5c14fdeca707cf6af0f65e3f5 | |
| parent | 6044f161d3bc74fc983b649b0d8fb91abf730a80 (diff) | |
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 <michaelni@gmx.at>
| -rw-r--r-- | libswscale/arm/Makefile | 6 | ||||
| -rw-r--r-- | libswscale/swscale_unscaled.c | 4 |
2 files changed, 5 insertions, 5 deletions
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); } |