[vlc-commits] contrib/ffmpeg: don't specifiy arch flag twice for Darwin platforms
Felix Paul Kühne
git at videolan.org
Thu Oct 3 18:29:41 CEST 2013
vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Thu Oct 3 18:26:05 2013 +0200| [f1278f3f2a15a77df5bfc99f6b4307dbfce2f2eb] | committer: Felix Paul Kühne
contrib/ffmpeg: don't specifiy arch flag twice for Darwin platforms
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f1278f3f2a15a77df5bfc99f6b4307dbfce2f2eb
---
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 bd6751a..6c04f1f 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -56,7 +56,9 @@ endif
# ARM stuff
ifeq ($(ARCH),arm)
+ifndef HAVE_DARWIN_OS
FFMPEGCONF += --arch=arm
+endif
ifdef HAVE_NEON
FFMPEGCONF += --enable-neon
endif
More information about the vlc-commits
mailing list