vlc | branch: master | Felix Paul Kühne <[email protected]> | Mon Oct 5 19:23:10 2015 +0200| [7ddd72bf6eb3a9ef777183f50b6819b9cf8c5c97] | committer: Felix Paul Kühne
contrib/ffmpeg: disable videotoolbox decoder since we have our own > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7ddd72bf6eb3a9ef777183f50b6819b9cf8c5c97 --- 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 30e51d6..032d66a 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 _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
