RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This reverts commit c8c7736c10.
This commit is contained in:
Michael Niedermayer 2014-01-12 18:01:23 +01:00
parent 842b8f4ba2
commit 6044f161d3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libswscale/arm/Makefile
View File

@ -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

4
libswscale/swscale_unscaled.c
View File

@ -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);
}