[vlc-commits] contrib/ffmpeg: don't specifiy arch flag twice for Darwin platforms

[Felix Paul Kühne]

vlc/vlc-2.1 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Thu Oct  3 18:26:05 2013 +0200| [8c9d009d986658348a17b945b1c8605027adeab9] | committer: Felix Paul Kühne

contrib/ffmpeg: don't specifiy arch flag twice for Darwin platforms

(cherry picked from commit f1278f3f2a15a77df5bfc99f6b4307dbfce2f2eb)

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

 contrib/src/ffmpeg/rules.mak |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index b534397..84acdd2 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -64,7 +64,9 @@ endif
 
 # ARM stuff
 ifeq ($(ARCH),arm)
+ifndef HAVE_DARWIN_OS
 FFMPEGCONF += --arch=arm
+endif
 ifdef HAVE_NEON
 FFMPEGCONF += --enable-neon
 endif