[vlc-commits] contrib/ffmpeg: disable lzma for Darwin

Felix Paul Kühne git at videolan.org
Tue Feb 3 16:47:35 CET 2015


vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Tue Feb  3 16:42:01 2015 +0100| [6c7b1c97f6d940fef736cf4848b2ca67f4d97190] | committer: Felix Paul Kühne

contrib/ffmpeg: disable lzma for Darwin

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

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

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index d9a9d5c..3262867 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -105,6 +105,9 @@ endif
 # Darwin
 ifdef HAVE_DARWIN_OS
 FFMPEGCONF += --arch=$(ARCH) --target-os=darwin
+ifdef USE_FFMPEG
+FFMPEGCONF += --disable-lzma
+endif
 ifeq ($(ARCH),x86_64)
 FFMPEGCONF += --cpu=core2
 endif



More information about the vlc-commits mailing list