[vlc-commits] contrib/ffmpeg: fixed compilation for OSX and enable vda hardware acceleration by default

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Wed Mar  6 16:24:07 2013 +0100| [48fba020f8f05de9aaee2df9d563f5bcf2872eb2] | committer: Felix Paul Kühne

contrib/ffmpeg: fixed compilation for OSX and enable vda hardware acceleration by default

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

 contrib/src/ffmpeg/rules.mak |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 61477f8..db8e28c 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -46,7 +46,7 @@ endif
 
 ifdef HAVE_CROSS_COMPILE
 FFMPEGCONF += --enable-cross-compile
-ifndef HAVE_IOS
+ifndef HAVE_DARWIN_OS
 FFMPEGCONF += --cross-prefix=$(HOST)-
 endif
 endif
@@ -89,6 +89,9 @@ ifeq ($(ARCH),arm)
 FFMPEGCONF += --enable-pic --as="$(AS)"
 endif
 endif
+ifdef HAVE_MACOSX
+FFMPEGCONF += --enable-vda
+endif
 
 # Linux
 ifdef HAVE_LINUX