Merge branch 'debpsuedomerge' into buster-working

diff --cc debian/changelog
index 6f36ad0b84fdc1d63defbeed85af641cd20986eb,fffe2478af5867ea90246ea9eecf7cdaca5e8667..250af57497362b1dfe2e0788851a7bc4f37db8a9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,14 +1,21 @@@
+ vlc (2.2.6-3) unstable; urgency=medium
+ 
+   [ Mateusz Łukasik ]
+   * debian/patches: avcodec: Check visible sizes (CVE-2017-10699).
+ 
+   [ Sebastian Ramacher ]
+   * debian/patches: flac: Fix heap write overflow on frame format change.
+     (CVE-2017-9300)
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Tue, 11 Jul 2017 21:35:32 +0200
+ 
 +vlc (2.2.6-2+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 2.2.6-1~deb9u1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 01 Jun 2017 15:47:33 +0000]
 +  * Version build-dependency on libsndio-dev so libroar-dev will not satisfy it.
 +
 + -- Raspbian forward porter <root@raspbian.org>  Sat, 01 Jul 2017 23:31:17 +0000
 +
  vlc (2.2.6-2) unstable; urgency=medium
  
    * Upload to unstable.