[vlc-commits] commit: contribs: ffmpeg depends on yasm and we build it from source on osx ( Rafaël Carré )

[git at videolan.org]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Mon Nov  8 22:35:50 2010 +0100| [f0cececc9f761475c0b91dd01a4aa43f3e2c8af8] | committer: Rafaël Carré 

contribs: ffmpeg depends on yasm and we build it from source on osx

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

 extras/contrib/src/contrib-src.mak |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 1ab0fb3..84268d7 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -1122,13 +1122,14 @@ ifeq ($(ARCH),armel)
 HAVE_ARMELF=1
 endif
 
-FFMPEG_DEPS-$(ENABLED)     = .lame .gsm .libvpx .zlib
-FFMPEG_DEPS-$(HAVE_WINCE)  = .zlib
-FFMPEG_DEPS-$(HAVE_UCLIBC) =
-FFMPEG_DEPS-$(HAVE_IOS)    =
-FFMPEG_DEPS-$(HAVE_WIN64)  = .lame .gsm .zlib
-FFMPEG_DEPS-$(HAVE_ARMELF) = .lame .gsm .zlib
-FFMPEG_DEPS-$(HAVE_WIN32) += .dshow_headers
+FFMPEG_DEPS-$(ENABLED)      = .lame .gsm .libvpx .zlib
+FFMPEG_DEPS-$(HAVE_WINCE)   = .zlib
+FFMPEG_DEPS-$(HAVE_UCLIBC)  =
+FFMPEG_DEPS-$(HAVE_IOS)     =
+FFMPEG_DEPS-$(HAVE_WIN64)   = .lame .gsm .zlib
+FFMPEG_DEPS-$(HAVE_ARMELF)  = .lame .gsm .zlib
+FFMPEG_DEPS-$(HAVE_MACOSX) += .yasm
+FFMPEG_DEPS-$(HAVE_WIN32)  += .dshow_headers
 
 ifdef SVN
 FFMPEG_MK_TARGET = ffmpeg/.svn-co