[vlc-commits] Contribs: ffmpeg, neon factorization

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Jun 15 01:13:58 2011 +0200| [df8d46d73f5f781fb9137e3c4e66c4befc19f7c4] | committer: Jean-Baptiste Kempf

Contribs: ffmpeg, neon factorization

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=df8d46d73f5f781fb9137e3c4e66c4befc19f7c4
---

 extras/contrib/src/contrib-src.mak |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index dda0256..1066297 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -959,6 +959,7 @@ FFMPEGCONF = --disable-doc \
 	--disable-network
 
 FFMPEGCONFSMALL = --disable-encoders --disable-muxers
+FFMPEGCONFNEON = --cpu=cortex-a8 --disable-runtime-cpudetect --enable-neon
 
 #Cross-Compilation
 ifdef HAVE_CROSS_COMPILE
@@ -1023,7 +1024,7 @@ endif
 ifdef HAVE_IOS
 FFMPEGCONF += --sysroot=${IOS_SDK_ROOT}
 ifeq ($(ARCH),arm)
-FFMPEGCONF += --disable-runtime-cpudetect --enable-neon --cpu=cortex-a8
+FFMPEGCONF += $(FFMPEGCONFNEON)
 else
 FFMPEGCONF += --disable-mmx
 endif
@@ -1036,12 +1037,15 @@ endif
 
 ifdef HAVE_MAEMO
 ifneq ($(filter -m%=cortex-a8, $(EXTRA_CFLAGS)),)
-FFMPEGCONF += --disable-runtime-cpudetect --enable-neon --cpu=cortex-a8
+FFMPEGCONF += $(FFMPEGCONFNEON)
 endif
 endif
 
 ifdef HAVE_ANDROID
-FFMPEGCONF+= --disable-encoders --disable-muxers
+ifdef HAVE_NEON
+FFMPEGCONF += $(FFMPEGCONFNEON)
+FFMPEG_CFLAGS +=-mfloat-abi=softfp -mfpu=neon
+endif
 endif
 
 ifdef HAVE_UCLIBC