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

diff --cc debian/changelog
index e538f4a7a668567dbecb1b920b59915788750175,9654283831f7bb9f1e7596590e145a11201298fe..56460bd85a9c189d663079957396307ec708b289
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,17 +1,34 @@@
- libav (6:11.12-1~deb8u5+rpi1) jessie-staging; urgency=medium
++libav (6:11.12-1~deb8u6+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>  Sun, 03 Feb 2019 14:32:06 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 02 Apr 2019 15:32:42 +0000
++
+ libav (6:11.12-1~deb8u6) jessie-security; urgency=medium
+ 
+   * Non-maintainer upload by the LTS team.
+   * CVE-2018-1999012: avformat/pva: Check for EOF before retrying in
+     read_part_of_packet().
+   * CVE-2015-1872: avcodec/mjpegdec: Check number of components for
+     JPEG-LS.
+   * CVE-2018-6392: avfilter/vf_transpose: Fix out of array access (including
+     later regression fix with packed pixel formats).
+   * CVE-2017-14058: avformat/hls: Fix DoS due to infinite loop.
+   * CVE-2017-1000460: h264dec: handle zero-sized NAL units in
+     get_last_needed_nal().
+ 
+  -- Mike Gabriel <sunweaver@debian.org>  Sat, 30 Mar 2019 21:44:13 +0100
  
  libav (6:11.12-1~deb8u5) jessie-security; urgency=medium