[vlc-commits] contrib: ffmpeg: fix OSX linking with vda enabled

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Thu Nov 24 19:10:14 2011 -0500| [08b3a966d270bd38e31db35978cc8de713d14575] | committer: Rafaël Carré

contrib: ffmpeg: fix OSX linking with vda enabled

patch sent to libav

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

 contrib/src/ffmpeg/rules.mak |    1 +
 contrib/src/ffmpeg/vda.patch |   10 ++++++++++
 2 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 45dc379..7af652e 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 0000000..114da81
--- /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
+