diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-12 18:01:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-12 18:01:39 +0100 |
| commit | 6044f161d3bc74fc983b649b0d8fb91abf730a80 (patch) | |
| tree | a071fb21b051cb3b63110bc5be0e14213abbc869 /libswscale | |
| parent | 842b8f4ba2e79b9c004a67f6fdb3d5c5d05805d3 (diff) | |
| download | ffmpeg-6044f161d3bc74fc983b649b0d8fb91abf730a80.tar.gz | |
Revert "swscale: disable ARM code until its build failure with clang/iphone is fixed"
This reverts commit c8c7736c1025bcf5bb27e104a0d0eae749408739.
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 8b5a97b54c..41ff6ff714 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 6bcfa3efa7..4a0a9f818b 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); } |