Merge version 6:11.12-1~deb8u6+rpi1 and 6:11.12-1~deb8u7 to produce 6:11.12-1~deb8u7...

diff --cc debian/changelog
index 56460bd85a9c189d663079957396307ec708b289,e0d35c67ce9fee66dcce6acd5f162906c0ce93c4..899576a94adef07270ba15d58f8ef85045aca90a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,11 +1,28 @@@
- libav (6:11.12-1~deb8u6+rpi1) jessie-staging; urgency=medium
++libav (6:11.12-1~deb8u7+rpi1) jessie-staging; urgency=medium
 +
 +  [changes brought forward from 6:11.3-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 29 Mar 2015 02:07:33 +0000]
 +  * Add special case handling for Raspbian (and any derivatives thereof) (Closes: 738760)
 +    + Disable armv6t2
 +      - note: the thumb2 variant of arv6 seems to be very rare, the Pi certainly
 +        doesn't have it.
 +    + Disable neon in the main build.
 +    + Don't build a seperate neon flavour either.
 +
 +  [changes brought forward from 6:11.4-1~deb8u1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Thu, 11 Feb 2016 15:58:25 +0000]
 +  * Re-enable specific neon build.
 +  * Move armv6t2 and neon disabling from overall configure flags to static
 +    and shared configure flags so they don't impact the neon-specific build.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 02 Apr 2019 15:32:42 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 31 May 2019 03:23:38 +0000
++
+ libav (6:11.12-1~deb8u7) jessie-security; urgency=medium
+ 
+   * Non-maintainer upload by the LTS team.
+   * CVE-2019-11338: avcodec/hevc: Avoid only partly skiping duplicate first
+     slices.
+   * CVE-2018-15822: avformat/flvenc: Check audio packet size. 
+ 
+  -- Mike Gabriel <sunweaver@debian.org>  Tue, 28 May 2019 14:14:01 +0200
  
  libav (6:11.12-1~deb8u6) jessie-security; urgency=medium