Merge version 6:11.11-1~deb8u1+rpi1 and 6:11.12-1~deb8u1 to produce 6:11.12-1~deb8u1...

diff --cc debian/changelog
index f8e890994abc96c336228b6efa769a49b16fe9ec,60d4f7235928dbd985b87a4dae61116dbe9940f6..f1141b082b04e4a7cf31615959e93d7857e2fd55
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,10 +1,27 @@@
- libav (6:11.11-1~deb8u1+rpi1) jessie-staging; urgency=medium
++libav (6:11.12-1~deb8u1+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>  Thu, 02 Nov 2017 11:26:23 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 21 Feb 2018 03:02:59 +0000
++
+ libav (6:11.12-1~deb8u1) jessie-security; urgency=medium
+ 
+   * New upstream release.
+     - smacker: add sanity check for length in smacker_decode_tree()
+       (CVE-2017-16803)
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Sun, 18 Feb 2018 21:20:56 +0100
  
  libav (6:11.11-1~deb8u1) jessie-security; urgency=medium