vlc/vlc-2.2 | branch: master | Felix Paul Kühne <[email protected]> | Tue Feb 3 16:42:01 2015 +0100| [277f15203156e99847818837eaa0c3110619d0a7] | committer: Felix Paul Kühne
contrib/ffmpeg: disable lzma for Darwin (cherry picked from commit 6c7b1c97f6d940fef736cf4848b2ca67f4d97190) > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=277f15203156e99847818837eaa0c3110619d0a7 --- 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 293b2e8..302360f 100644 --- a/contrib/src/ffmpeg/rules.mak +++ b/contrib/src/ffmpeg/rules.mak @@ -97,6 +97,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 _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
