From: Rafaël Carré <funman@videolan.org>
Date: Fri, 25 Nov 2011 00:10:14 +0000 (-0500)
Subject: contrib: ffmpeg: fix OSX linking with vda enabled
X-Git-Tag: 1.3.0-git~81
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=08b3a966d270bd38e31db35978cc8de713d14575;hp=b1ff303cd6736ff4b9ab9688cc4569a5f9006fa0;p=vlc

contrib: ffmpeg: fix OSX linking with vda enabled

patch sent to libav
---

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 45dc3798af..7af652e334 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -116,6 +116,7 @@ ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz .sum-ffmpeg
 ifdef HAVE_WIN32
 	sed -i "s/std=c99/std=gnu99/" $@-$(FFMPEG_VERSION)/configure
 endif
+	$(APPLY) $(SRC)/ffmpeg/vda.patch
 	$(MOVE)
 
 .ffmpeg: ffmpeg
diff --git a/contrib/src/ffmpeg/vda.patch b/contrib/src/ffmpeg/vda.patch
new file mode 100644
index 0000000000..114da81ad3
--- /dev/null
+++ b/contrib/src/ffmpeg/vda.patch
@@ -0,0 +1,10 @@
+--- ffmpeg-git/configure.orig	2011-11-24 19:07:09.080887690 -0500
++++ ffmpeg-git/configure	2011-11-24 19:07:36.597024164 -0500
+@@ -3000,6 +3000,7 @@
+     if check_header VideoDecodeAcceleration/VDADecoder.h; then
+         enable vda
+         add_ldflags -framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore
++        add_extralibs -framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore
+     fi
+ fi
+