contrib: ffmpeg: fix OSX linking with vda enabled

[vlc] / contrib / src / ffmpeg / rules.mak

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 21d1ad01c2127e54b9142d9b49a28c888a658db5..7af652e33419bd5ebafee54f484b59dc9275048c 100644 (file)
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -59,7 +59,6 @@ endif
 ifeq ($(ARCH),x86_64)
 FFMPEGCONF += --cpu=core2
 endif
-DEPS_ffmpeg += yasm $(DEPS_yasm)
 endif
 
 # Linux
@@ -113,10 +112,11 @@ FFMPEG_VERSION := git
 ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz .sum-ffmpeg
        rm -Rf $@ $@-git
        mkdir -p $@-git
-       zcat "$<" | (cd $@-git && tar xv --strip-components=1)
+       $(ZCAT) "$<" | (cd $@-git && tar xv --strip-components=1)
 ifdef HAVE_WIN32
        sed -i "s/std=c99/std=gnu99/" $@-$(FFMPEG_VERSION)/configure
 endif
+       $(APPLY) $(SRC)/ffmpeg/vda.patch
        $(MOVE)
 
 .ffmpeg: ffmpeg