[vlc-commits] contrib/ffmpeg: minor cleanup

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Mon Dec  8 23:50:04 2014 +0100| [edd9048b56d680967f7fe65eb20ba458d91772eb] | committer: Felix Paul Kühne

contrib/ffmpeg: minor cleanup

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

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

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index b660848..6b94cbb 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -67,9 +67,7 @@ endif
 
 # ARM stuff
 ifeq ($(ARCH),arm)
-ifndef HAVE_DARWIN_OS
 FFMPEGCONF += --arch=arm
-endif
 ifdef HAVE_NEON
 FFMPEGCONF += --enable-neon
 endif
@@ -83,10 +81,8 @@ endif
 
 # ARM64 stuff
 ifeq ($(ARCH),aarch64)
-ifndef HAVE_DARWIN_OS
 FFMPEGCONF += --arch=aarch64
 endif
-endif
 
 # MIPS stuff
 ifeq ($(ARCH),mipsel)
@@ -113,7 +109,6 @@ FFMPEGCONF += --arch=$(ARCH) --target-os=darwin
 ifeq ($(ARCH),x86_64)
 FFMPEGCONF += --cpu=core2
 endif
-endif
 ifdef HAVE_IOS
 FFMPEGCONF += --enable-pic --extra-ldflags="$(EXTRA_CFLAGS)"
 ifdef HAVE_NEON
@@ -123,6 +118,7 @@ endif
 ifdef HAVE_MACOSX
 FFMPEGCONF += --enable-vda
 endif
+endif
 
 # Linux
 ifdef HAVE_LINUX