[vlc-commits] contrib: ffmpeg: remove unused FFMPEG_CFLAGS

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Thu Jan  3 16:39:46 2013 +0100| [1ee58d84740f2fb04b9046efa9a4f9ddd26a967b] | committer: Rafaël Carré

contrib: ffmpeg: remove unused FFMPEG_CFLAGS

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

 contrib/src/ffmpeg/rules.mak |   15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 4798065..b55a022 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -55,10 +55,6 @@ ifeq ($(ARCH),arm)
 FFMPEGCONF += --arch=arm
 ifdef HAVE_ARMV7A
 FFMPEGCONF += --cpu=cortex-a8 --enable-neon
-FFMPEG_CFLAGS += -mfpu=vfpv3-d16
-ifndef HAVE_ANDROID # We want NEON autodetect on Android
-FFMPEG_CFLAGS += -mfpu=neon
-endif
 endif
 endif
 
@@ -94,17 +90,6 @@ endif
 ifdef HAVE_LINUX
 FFMPEGCONF += --target-os=linux --enable-pic
 
-# Android x86
-ifeq ($(ANDROID_ABI), x86)
-ifdef HAVE_ANDROID
-# Android-x86 gcc doesn't guarantee an aligned stack, but this is
-# handled by __attribute__((force_align_arg_pointer)) in libavcodec
-# already, so we tell gcc to assume this alignment, so we don't need
-# to waste a precious register in assembly functions to realign it.
-FFMPEG_CFLAGS += -mincoming-stack-boundary=4
-endif # HAVE_ANDROID
-endif # x86
-
 endif
 
 # Windows