[vlc-commits] Revert '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 Nov 30 11:59:04 2015 +0100| [b6b38102e3c03337191ca4aee8ac9ff8da11e1ae] | committer: Felix Paul Kühne

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

This reverts commit ecbf8dd0585fcaca558859e85e9df7447f9eda28.

The currently deployed ffmpeg hash doesn't have that configure option.

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

 contrib/src/ffmpeg/rules.mak |    4 ----
 1 file changed, 4 deletions(-)

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