[SCM] vlc/master: Update to ffmpeg 2.8.11

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 94670e722cfbe590d744553adf6fd994fd9632d0
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date:   Tue Feb 14 20:05:21 2017 +0100

    Update to ffmpeg 2.8.11
    
    (cherry picked from commit aac43ece1805f931281290e9a5fb53d37f38393a)

diff --git a/debian/changelog b/debian/changelog
index 781f984..d7a0f69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vlc (2.2.4-14) UNRELEASED; urgency=medium
+
+  * Update to ffmpeg 2.8.11.
+
+ -- Mateusz Łukasik <mati75 at linuxmint.pl>  Tue, 14 Feb 2017 20:03:56 +0100
+
 vlc (2.2.4-13) unstable; urgency=medium
 
   * debian/control: Switch to libopenmpt's libmodplug comat layer.
diff --git a/debian/rules b/debian/rules
index 35ebba4..8d48ec8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -346,7 +346,7 @@ override_dh_autoreconf:
 override_dh_auto_configure:
 	mkdir -p $(ffmpegbuild) $(ffmpegprefix)
 	cd $(ffmpegbuild) && \
-		$(CURDIR)/ffmpeg-2-8-10/configure $(ffmpegflags)
+		$(CURDIR)/ffmpeg-2-8-11/configure $(ffmpegflags)
 	dh_auto_build --sourcedirectory $(ffmpegbuild) -- V=1
 	$(MAKE) -C $(ffmpegbuild) install-libs install-headers V=1
 	PKG_CONFIG_PATH=$(ffmpegprefix)/lib/pkgconfig \
diff --git a/debian/watch b/debian/watch
index 764a7c1..8c44274 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,5 @@
 version=4
 opts=pgpsigurlmangle=s/$/.asc/ \
 http://download.videolan.org/pub/videolan/vlc/([\d][\d\.]+[a-z]?)/vlc-([\d][\d\.]+[a-z]?)\.tar\.xz debian
-opts=component=ffmpeg-2-8-10 \
-https://ffmpeg.org/releases/ffmpeg-2\.8\.([0-9.]+)\.tar\.xz 2.8.10
+opts=component=ffmpeg-2-8-11 \
+https://ffmpeg.org/releases/ffmpeg-2\.8\.([0-9.]+)\.tar\.xz 2.8.11

-- 
VLC media player packaging