[vlc-devel] [PATCH 1/4] contrib: ffmpeg: do not enable openjpeg v2 on Libav

[Konstantin Pavlov]

On Thu, Dec 07, 2017 at 06:30:59AM -0500, Sean McGovern wrote:
> ---
>  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 f2fa142..5a1ddd9 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

LGTM, I have the similar patch in my push queue.

-- 
VideoLAN, Vice President
www.videolan.org
+7 926 165 45 31
@cryothresh