aboutsummaryrefslogtreecommitdiffstats
path: root/libswscale/arm/Makefile
diff options
context:
space:
mode:
authorXiaolei Yu <dreifachstein@gmail.com>2016-02-22 19:50:13 +0800
committerMichael Niedermayer <michael@niedermayer.cc>2016-02-22 17:29:58 +0100
commit5a91589476096c20cb6c971ef3ce4d91e41d752b (patch)
treebf02f8ff50f0169b91a209bc0d1be9e0fcfbc6d7 /libswscale/arm/Makefile
parent1ec7a703806049265991723a8826bd61555edef4 (diff)
downloadffmpeg-5a91589476096c20cb6c971ef3ce4d91e41d752b.tar.gz
swscale/arm: re-enable neon rgbx to nv12 routines
Commit '842b8f4ba2e79b9c004a67f6fdb3d5c5d05805d3' fixed clang/iphone build but failed on some versions of cygwin. It has now been verified to work on both platforms. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libswscale/arm/Makefile')
-rw-r--r--libswscale/arm/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/arm/Makefile b/libswscale/arm/Makefile
index 97b356135d..9ccec3bbc0 100644
--- a/libswscale/arm/Makefile
+++ b/libswscale/arm/Makefile
@@ -1,5 +1,5 @@
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
NEON-OBJS += arm/yuv2rgb_neon.o