[SCM] vlc/master: Update ffmpeg to 2.8.7

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ba0e7ba4f72b12dffcc458080dd6b9b859b7e36f
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun May 1 21:04:43 2016 +0200

    Update ffmpeg to 2.8.7

diff --git a/debian/rules b/debian/rules
index 75d149f..f0de01c 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-6/configure $(ffmpegflags)
+		$(CURDIR)/ffmpeg-2-8-7/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 623c9fb..fd57772 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-6 \
-https://ffmpeg.org/releases/ffmpeg-2\.8\.([0-9.]+)\.tar\.xz 2.8.6
+opts=component=ffmpeg-2-8-7 \
+https://ffmpeg.org/releases/ffmpeg-2\.8\.([0-9.]+)\.tar\.xz 2.8.7

-- 
VLC media player packaging