[vlc-commits] Revert "contrib: ffmpeg: add some cflags for arm/neon"

Rémi Denis-Courmont git at videolan.org
Sun Nov 27 11:04:53 CET 2011


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Nov 27 12:01:13 2011 +0200| [41f1c9374cc136e6b191bf02ce637d8658cc2d87] | committer: Rémi Denis-Courmont

Revert "contrib: ffmpeg: add some cflags for arm/neon"

This reverts commit f625f16aa49ce21aec65f02993e02213a6ab31f6.
This disabled NEON on non-Android ARM systems.

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

 contrib/src/ffmpeg/rules.mak |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index a4ca133..7622360 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -43,11 +43,7 @@ endif
 
 # ARM stuff
 ifeq ($(ARCH),arm)
-FFMPEGCONF += --disable-runtime-cpudetect --arch=arm
-ifdef HAVE_NEON
-FFMPEGCONF += --cpu=cortex-a8 --enable-neon
-FFMPEG_CFLAGS +=-mfloat-abi=softfp -mfpu=neon
-endif
+FFMPEGCONF += --disable-runtime-cpudetect
 endif
 
 # Darwin



More information about the vlc-commits mailing list