[SCM] vlc/master: Build ffmpeg without libopenjpeg

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7e3eec909b77d9f5a93e6d5085fe66ac430f00ee
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Jun 11 11:32:49 2016 +0200

    Build ffmpeg without libopenjpeg
    
    Closes: #826827

diff --git a/debian/control b/debian/control
index 4b897c3..c74a938 100644
--- a/debian/control
+++ b/debian/control
@@ -127,7 +127,6 @@ Build-Depends: autopoint,
                libgsm1-dev,
                liblzma-dev,
                libmp3lame-dev,
-               libopenjpeg-dev,
                librtmp-dev,
                libsnappy-dev,
                libsoxr-dev,
diff --git a/debian/rules b/debian/rules
index fb74b0f..b7bb341 100755
--- a/debian/rules
+++ b/debian/rules
@@ -259,7 +259,6 @@ ffmpegflags += \
 # from ffmpeg 7:2.8.6-1 debian/rules and contrib/src/ffmpeg/rules.mak
 ffmpegflags += \
 	--enable-gpl \
-	--disable-decoder=libopenjpeg \
 	--disable-decoder=libschroedinger \
 	--enable-gnutls \
 	--disable-libass \
@@ -271,11 +270,11 @@ ffmpegflags += \
 	--disable-libfontconfig \
 	--disable-libfreetype \
 	--disable-libfribidi \
+	--disable-libopenjpeg \
 	--enable-libgme \
 	--enable-libgsm \
 	--enable-libmodplug \
 	--enable-libmp3lame \
-	--enable-libopenjpeg \
 	--enable-libopus \
 	--enable-librtmp \
 	--enable-libschroedinger \

-- 
VLC media player packaging