diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-08 17:12:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-08 17:17:34 +0100 |
| commit | c8c7736c1025bcf5bb27e104a0d0eae749408739 (patch) | |
| tree | 2d22ba49cdc388cb03f83613d1998064d39a7d51 /libswscale | |
| parent | c6fe984f2ff048ae31f2acc8ddaf0449cb0c4aea (diff) | |
| download | ffmpeg-c8c7736c1025bcf5bb27e104a0d0eae749408739.tar.gz | |
swscale: disable ARM code until its build failure with clang/iphone is fixed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
| -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 ccf9980d5a..0f0f5fe634 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -1384,8 +1384,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); } |