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

This reverts commit c8c7736c.

Revert "swscale: disable ARM code until its build failure with clang/iphone is fixed"
This reverts commit c8c7736c.
6044f161 · Michael Niedermayer · 842b8f4b · 6044f161 · 6044f161
Commit 6044f161 authored Jan 12, 2014 by Michael Niedermayer
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

Makefile libswscale/arm/Makefile +3 -3

swscale_unscaled.c libswscale/swscale_unscaled.c +2 -2

No files found.
--- a/libswscale/arm/Makefile
+++ b/libswscale/arm/Makefile
-# 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
--- 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);

 }