]> git.sesse.net Git - vlc/commitdiff
contrib: ffmpeg: fix OSX linking with vda enabled
authorRafaël Carré <funman@videolan.org>
Fri, 25 Nov 2011 00:10:14 +0000 (19:10 -0500)
committerRafaël Carré <funman@videolan.org>
Fri, 25 Nov 2011 00:10:59 +0000 (19:10 -0500)
patch sent to libav

contrib/src/ffmpeg/rules.mak
contrib/src/ffmpeg/vda.patch [new file with mode: 0644]

index 45dc3798af798cc39b97585ec3be760f68ac1b1c..7af652e33419bd5ebafee54f484b59dc9275048c 100644 (file)
@@ -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 (file)
index 0000000..114da81
--- /dev/null
@@ -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