[SCM] ffmpeg/jessie: Revert "Switch from libmodplug to libopenmpt. (Closes: #849840)"

[rbalint at users.alioth.debian.org]

The following commit has been merged in the jessie branch:
commit 026858c2891239b7ab7426745776b171e3f8fa15
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Sat Jan 21 22:39:15 2017 +0100

    Revert "Switch from libmodplug to libopenmpt. (Closes: #849840)"
    
    This reverts commit 0cd5b895c748d12db8285283c46f3904c91d6423.

diff --git a/debian/control b/debian/control
index 6e9d95a..254bd12 100644
--- a/debian/control
+++ b/debian/control
@@ -75,6 +75,8 @@ Build-Depends:
  libleptonica-dev,
 # autodetected for the tiff decoder
  liblzma-dev,
+# --enable-libmodplug
+ libmodplug-dev,
 # --enable-libmp3lame
  libmp3lame-dev,
 # --enable-netcdf
@@ -91,8 +93,6 @@ Build-Depends:
  libopencv-imgproc-dev <!stage1>,
 # --enable-libopenjpeg
  libopenjp2-7-dev,
-# --enable-libopenmpt
- libopenmpt-dev,
 # --enable-libopus
  libopus-dev,
 # --enable-libpulse
diff --git a/debian/rules b/debian/rules
index f4559b5..2e1da1e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,9 +31,9 @@ FLAVORS = standard extra static
 #   --enable-libilbc                (see #675959 for the RFP bug)
 #   --enable-libkvazaar
 #   --enable-libmfx
-#   --enable-libmodplug             (see #849840: replaced with libopenmpt)
 #   --enable-libnut
 #   --enable-libopenh264
+#   --enable-libopenmpt
 #   --enable-libschroedinger        (see #845037: removal due to security issues)
 #   --enable-libutvideo
 #   --enable-libvidstab             (see #709193 for the RFP bug)
@@ -67,9 +67,9 @@ CONFIG := --prefix=/usr \
 	--enable-libfribidi \
 	--enable-libgme \
 	--enable-libgsm \
+	--enable-libmodplug \
 	--enable-libmp3lame \
 	--enable-libopenjpeg \
-	--enable-libopenmpt \
 	--enable-libopus \
 	--enable-libpulse \
 	--enable-librubberband \

-- 
ffmpeg packaging