[vlc-commits] contrib/ffmpeg: disable videotoolbox decoder since we have our own

[Felix Paul Kühne]

vlc/vlc-2.2 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Mon Oct  5 19:23:10 2015 +0200| [ecbf8dd0585fcaca558859e85e9df7447f9eda28] | committer: Jean-Baptiste Kempf

contrib/ffmpeg: disable videotoolbox decoder since we have our own

(cherry picked from commit 7ddd72bf6eb3a9ef777183f50b6819b9cf8c5c97)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

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

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 2f01fb9..e5387ed 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -34,6 +34,10 @@ ifdef USE_FFMPEG
 FFMPEGCONF += \
 	--disable-swresample \
 	--disable-iconv
+ifdef HAVE_DARWIN_OS
+FFMPEGCONF += \
+	--disable-videotoolbox
+endif
 endif
 
 DEPS_ffmpeg = zlib gsm openjpeg