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

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Mar 21 17:55:37 2012 +0200| [613515d9c600d2e3aba678c9c656150433f39f15] | committer: Rémi Denis-Courmont

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

This reverts commit f625f16aa49ce21aec65f02993e02213a6ab31f6.
For the umpteenth time, unbreak hard FP ARM ABI.

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

 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 34c86ee..7eee2ff 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -49,11 +49,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