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/arm/Makefile | |
| 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/arm/Makefile')
| -rw-r--r-- | libswscale/arm/Makefile | 6 |
1 files changed, 3 insertions, 3 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 |