From 58ef6e995c1a7d9d43c4ec1925845a3cd8d4d5df Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Fri, 25 Nov 2011 21:12:27 -0500 Subject: [PATCH] Revert "contrib: ffmpeg: fix OSX linking with vda enabled" This reverts commit 08b3a966d270bd38e31db35978cc8de713d14575. Patch was merged in libav and ffmpeg --- contrib/src/ffmpeg/rules.mak | 1 - contrib/src/ffmpeg/vda.patch | 10 ---------- 2 files changed, 11 deletions(-) delete mode 100644 contrib/src/ffmpeg/vda.patch diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak index 7af652e334..45dc3798af 100644 --- a/contrib/src/ffmpeg/rules.mak +++ b/contrib/src/ffmpeg/rules.mak @@ -116,7 +116,6 @@ 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 deleted file mode 100644 index 114da81ad3..0000000000 --- a/contrib/src/ffmpeg/vda.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 - -- 2.39.2