[FFmpeg-cvslog] swscale: disable ARM code until its build failure with clang/ iphone is fixed
Michael Niedermayer
git at videolan.org
Sun Jan 12 20:11:47 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jan 8 17:12:22 2014 +0100| [6bd001d76657bfcfe3cf11efd1256866a03ad329] | committer: Michael Niedermayer
swscale: disable ARM code until its build failure with clang/iphone is fixed
See: "19:40 Yu Xiaolei Re: [FFmpeg-devel] [PATCH] fix build with gas-preprocessor.pl"
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6bd001d76657bfcfe3cf11efd1256866a03ad329
---
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 41ff6ff..8b5a97b 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 4a0a9f8..6bcfa3e 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);
}
More information about the ffmpeg-cvslog
mailing list