vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Tue May 3 11:46:32 2016 +0200| [2f9a6c5255ff9884641778e2c6c6392b32ae65f3] | committer: Hugo Beauzée-Luyssen
Revert "contrib: ffmpeg/libav: Disable gnutls" This reverts commit ad82fe3f802a11b86aaff7bdaecb80e48ed601e0. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2f9a6c5255ff9884641778e2c6c6392b32ae65f3 --- contrib/src/ffmpeg/rules.mak | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak index aab4657..6c166a0 100644 --- a/contrib/src/ffmpeg/rules.mak +++ b/contrib/src/ffmpeg/rules.mak @@ -30,8 +30,7 @@ FFMPEGCONF = \ --disable-protocol=concat \ --disable-bsfs \ --disable-bzlib \ - --disable-avresample \ - --disable-gnutls + --disable-avresample ifdef USE_FFMPEG FFMPEGCONF += \ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
