[FFmpeg-cvslog] Revert "swscale: disable ARM code until its build failure with clang/ iphone is fixed"

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 12 18:01:23 2014 +0100| [6044f161d3bc74fc983b649b0d8fb91abf730a80] | committer: Michael Niedermayer

Revert "swscale: disable ARM code until its build failure with clang/iphone is fixed"

This reverts commit c8c7736c1025bcf5bb27e104a0d0eae749408739.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6044f161d3bc74fc983b649b0d8fb91abf730a80
---

 libswscale/arm/Makefile       |    6 +++---
 libswscale/swscale_unscaled.c |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libswscale/arm/Makefile b/libswscale/arm/Makefile
index 8b5a97b..41ff6ff 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 6bcfa3e..4a0a9f8 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);
 
 }