vlc | branch: master | Steve Lhomme <[email protected]> | Thu Mar 29 15:46:50 2018 +0200| [668d0178dd264e3b117ab4858515d0a6030e8b1b] | committer: Hugo Beauzée-Luyssen
contrib: ffmpeg: don't use libvpx at all in libavcodec We have our own decoder/encoder > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=668d0178dd264e3b117ab4858515d0a6030e8b1b --- contrib/src/ffmpeg/rules.mak | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak index 46e52ae55c..ca00a2bfae 100644 --- a/contrib/src/ffmpeg/rules.mak +++ b/contrib/src/ffmpeg/rules.mak @@ -33,6 +33,7 @@ FFMPEGCONF = \ --disable-protocol=concat \ --disable-bsfs \ --disable-bzlib \ + --disable-libvpx \ --disable-avresample \ --enable-bsf=vp9_superframe @@ -70,11 +71,8 @@ ifndef BUILD_NETWORK FFMPEGCONF += --disable-network endif ifdef BUILD_ENCODERS -FFMPEGCONF += --enable-libmp3lame --enable-libvpx --disable-decoder=libvpx_vp8 --disable-decoder=libvpx_vp9 -ifndef USE_FFMPEG -FFMPEGCONF += --disable-decoder=libvpx -endif -DEPS_ffmpeg += lame $(DEPS_lame) vpx $(DEPS_vpx) +FFMPEGCONF += --enable-libmp3lame +DEPS_ffmpeg += lame $(DEPS_lame) else FFMPEGCONF += --disable-encoders --disable-muxers endif _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
