vlc | branch: master | Sean McGovern <gsean...@gmail.com> | Thu Dec 7 06:30:59 2017 -0500| [f9fda2268ffd927ffb3b41d459c9092ff99364fe] | committer: Konstantin Pavlov
contrib: ffmpeg: do not enable openjpeg v2 on Libav > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f9fda2268ffd927ffb3b41d459c9092ff99364fe --- contrib/src/ffmpeg/rules.mak | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak index 297fe4c777..4a49cbc5be 100644 --- a/contrib/src/ffmpeg/rules.mak +++ b/contrib/src/ffmpeg/rules.mak @@ -25,7 +25,6 @@ FFMPEGCONF = \ --disable-encoder=vorbis \ --disable-decoder=opus \ --enable-libgsm \ - --enable-libopenjpeg \ --disable-debug \ --disable-avdevice \ --disable-devices \ @@ -49,7 +48,13 @@ FFMPEGCONF += \ endif endif -DEPS_ffmpeg = zlib gsm openjpeg +DEPS_ffmpeg = zlib gsm + +ifndef USE_LIBAV +FFMPEGCONF += \ + --enable-libopenjpeg +DEPS_ffmpeg += openjpeg +endif # Optional dependencies ifndef BUILD_NETWORK _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits