[SCM] vlc/experimental: Remove some cruft from embedded ffmpeg

[sramacher at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit eb72ce4932f35749b5c8a3b872145011409fa1e9
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Tue Sep 26 01:37:11 2017 +0200

    Remove some cruft from embedded ffmpeg

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index db18e06..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,11 +0,0 @@
-Embedded copy of ffmpeg
-=======================
-
-Until the release of vlc 3.0, vlc needs an embedded copy of ffmpeg 2.8.X. The
-embedded copy is implemented using 3.0 (quilt)'s support for multiple orig
-tarballs. When importing new upstream tarballs with gbp, do not forget to
-specify ffmpeg as a component. For example, run
-
-$ gbp import-orig ../vlc-2.2.X.tar.xz --component ffmpeg-2-8-Y
-
-to import a vlc upstream tarball and ffmpeg as component.
diff --git a/debian/vlc-plugin-base.lintian-overrides b/debian/vlc-plugin-base.lintian-overrides
index 02d56b4..2ddcbfc 100644
--- a/debian/vlc-plugin-base.lintian-overrides
+++ b/debian/vlc-plugin-base.lintian-overrides
@@ -1,16 +1,2 @@
 # Hardening compiler flags are correctly passed (bug #695319)
 vlc-plugin-base binary: hardening-no-fortify-functions usr/lib/*/vlc/plugins/*_plugin.so
-# vlc is currently not compatible with ffmpeg 3.0.
-vlc-plugin-base binary: embedded-library usr/lib/*/vlc/plugins/codec/libavcodec_plugin.so: libavutil
-vlc-plugin-base binary: embedded-library usr/lib/*/vlc/plugins/codec/libhwdummy_plugin.so: libavutil
-vlc-plugin-base binary: embedded-library usr/lib/*/vlc/plugins/video_chroma/libswscale_plugin.so: libavutil
-vlc-plugin-base binary: embedded-library usr/lib/*/vlc/plugins/video_chroma/libswscale_plugin.so: libswscale
-vlc-plugin-base binary: embedded-library usr/lib/*/vlc/plugins/video_filter/libpostproc_plugin.so: libavutil
-vlc-plugin-base binary: embedded-library usr/lib/*/vlc/plugins/video_filter/libpostproc_plugin.so: libpostproc
-vlc-plugin-base binary: embedded-library usr/lib/*/vlc/plugins/vdpau/libvdpau_avcodec_plugin.so: libavutil
-# hand-written assembler optimizations from ffmpeg
-vlc-plugin-base [i386] binary: shlib-with-non-pic-code usr/lib/i386-linux-gnu/vlc/plugins/codec/libavcodec_plugin.so
-vlc-plugin-base [i386] binary: shlib-with-non-pic-code usr/lib/i386-linux-gnu/vlc/plugins/codec/libhwdummy_plugin.so
-vlc-plugin-base [i386] binary: shlib-with-non-pic-code usr/lib/i386-linux-gnu/vlc/plugins/vdpau/libvdpau_avcodec_plugin.so
-vlc-plugin-base [i386] binary: shlib-with-non-pic-code usr/lib/i386-linux-gnu/vlc/plugins/video_chroma/libswscale_plugin.so
-vlc-plugin-base [i386] binary: shlib-with-non-pic-code usr/lib/i386-linux-gnu/vlc/plugins/video_filter/libpostproc_plugin.so
diff --git a/debian/watch b/debian/watch
index a67322f..7748700 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,3 @@
 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-13 \
-https://ffmpeg.org/releases/ffmpeg-2\.8\.([0-9.]+)\.tar\.xz 2.8.13

-- 
VLC media player packaging