contrib: ffmpeg: do not enable openjpeg v2 on Libav
authorSean McGovern <gseanmcg@gmail.com>
Thu, 7 Dec 2017 11:30:59 +0000 (06:30 -0500)
committerKonstantin Pavlov <thresh@videolan.org>
Thu, 7 Dec 2017 18:35:35 +0000 (21:35 +0300)
contrib/src/ffmpeg/rules.mak

index 297fe4c..4a49cbc 100644 (file)
@@ -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