[SCM] vlc/master: Update to ffmpeg 2.8.12

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 798cf1461b829986c36f7174b3c8021bac2e7823
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Jun 18 17:02:06 2017 +0200

    Update to ffmpeg 2.8.12

diff --git a/debian/changelog b/debian/changelog
index 8edf8f7..617799f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 vlc (2.2.6-2) UNRELEASED; urgency=medium
 
   * Upload to unstable.
+  * Update to ffmpeg 2.8.12.
   * debian/control:
     - Remove Build-Conflicts.
     - Bump Standards-Version.
diff --git a/debian/watch b/debian/watch
index 8c44274..c454b70 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-11 \
-https://ffmpeg.org/releases/ffmpeg-2\.8\.([0-9.]+)\.tar\.xz 2.8.11
+opts=component=ffmpeg-2-8-12 \
+https://ffmpeg.org/releases/ffmpeg-2\.8\.([0-9.]+)\.tar\.xz 2.8.12

-- 
VLC media player packaging