From 6044f161d3bc74fc983b649b0d8fb91abf730a80 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 12 Jan 2014 18:01:23 +0100 Subject: [PATCH] Revert "swscale: disable ARM code until its build failure with clang/iphone is fixed" This reverts commit c8c7736c1025bcf5bb27e104a0d0eae749408739. --- 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 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); }