Merge version 6:11.12-1~deb8u4+rpi1 and 6:11.12-1~deb8u5 to produce 6:11.12-1~deb8u5...

diff --cc debian/changelog
index 287a61021c1cd675c06a58ddf4ef9efe118c2206,a307ff86a0cca50f80f086d20c8efc775cf0fe67..e538f4a7a668567dbecb1b920b59915788750175
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,17 +1,34 @@@
- libav (6:11.12-1~deb8u4+rpi1) jessie-staging; urgency=medium
++libav (6:11.12-1~deb8u5+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, 10 Jan 2019 10:19:28 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 03 Feb 2019 14:32:06 +0000
++
+ libav (6:11.12-1~deb8u5) jessie-security; urgency=medium
+ 
+   * Non-maintainer upload by the LTS team..
+   * CVE-2015-1207: avformat/mov: Fix integer overflow in
+     mov_read_udta_string().
+   * CVE-2017-14169: In mxf_read_primer_pack() function, catch item_num
+     being negative, to avoid bypassing the check for a large value.
+   * CVE-2017-14223: avformat/asfdec: Fix DoS in asf_build_simple_index().
+     Fix missing EOF check in loop.
+   * CVE-2017-7863: Bail out if trns was found before IHDR or IDAT in PNG data. 
+   * CVE-2014-8542: Add case for jv to avcodec_align_dimensions2().
+   * CVE-2017-7865: Add case for interplay_video to avcodec_align_dimensions2().
+ 
+  -- Mike Gabriel <sunweaver@debian.org>  Mon, 21 Jan 2019 15:30:50 +0100
  
  libav (6:11.12-1~deb8u4) jessie-security; urgency=high