diff -Nru libextractor-1.6/debian/changelog libextractor-1.6/debian/changelog
--- libextractor-1.6/debian/changelog	2017-12-28 17:10:52.000000000 +0000
+++ libextractor-1.6/debian/changelog	2018-07-26 19:00:42.000000000 +0000
@@ -1,3 +1,11 @@
+libextractor (1:1.6-2+rpi1) buster-staging; urgency=medium
+
+  * Apply patch by James Cowgill from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=888373#16
+    To fix FTBFS with ffmpeg 4.0 .
+  * Build with gcc 7 to avoid ICE.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 26 Jul 2018 19:00:42 +0000
+
 libextractor (1:1.6-2) unstable; urgency=medium
 
   * Add patches from upstream to fix CVE-2017-15922 (Closes: #880016) and 
diff -Nru libextractor-1.6/debian/control libextractor-1.6/debian/control
--- libextractor-1.6/debian/control	2017-12-28 17:10:42.000000000 +0000
+++ libextractor-1.6/debian/control	2018-07-26 19:00:42.000000000 +0000
@@ -9,7 +9,7 @@
  libgtk-3-dev, libgtk2.0-dev, libgstreamer-plugins-base1.0-dev, libjpeg-dev,
  libmagick-dev, libmpeg2-4-dev, libmp4v2-dev, librpm-dev, libsmf-dev,
  libtidy-dev, libtiff-dev, libvorbis-dev, libogg-dev, zlib1g-dev, texinfo,
- libmagic-dev, libavresample-dev
+ libmagic-dev, libavresample-dev, gcc-7, g++-7
 Standards-Version: 4.1.3
 Vcs-Git: https://anonscm.debian.org/git/collab-maint/libextractor.git
 Vcs-browser: https://anonscm.debian.org/git/collab-maint/libextractor.git
diff -Nru libextractor-1.6/debian/patches/ffmpeg4.patch libextractor-1.6/debian/patches/ffmpeg4.patch
--- libextractor-1.6/debian/patches/ffmpeg4.patch	1970-01-01 00:00:00.000000000 +0000
+++ libextractor-1.6/debian/patches/ffmpeg4.patch	2018-07-26 19:00:10.000000000 +0000
@@ -0,0 +1,25 @@
+Description: Fix FTBFS with FFmpeg 4.0
+Author: James Cowgill <jcowgill@debian.org>
+Bug-Debian: https://bugs.debian.org/888373
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/plugins/thumbnailffmpeg_extractor.c
++++ b/src/plugins/thumbnailffmpeg_extractor.c
+@@ -107,7 +107,7 @@
+ /**
+  * Number of bytes to feed to libav in one go, with padding (padding is zeroed).
+  */
+-#define PADDED_BUFFER_SIZE (BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE)
++#define PADDED_BUFFER_SIZE (BUFFER_SIZE + AV_INPUT_BUFFER_PADDING_SIZE)
+ 
+ /**
+  * Global handle to MAGIC data.
+@@ -355,7 +355,7 @@ create_thumbnail (AVCodecContext *pCodec
+    encoder_codec_ctx->mb_lmin = encoder_codec_ctx->qmin * FF_QP2LAMBDA;
+    encoder_codec_ctx->mb_lmax = encoder_codec_ctx->qmax * FF_QP2LAMBDA;
+ #endif
+-   encoder_codec_ctx->flags          = CODEC_FLAG_QSCALE;
++   encoder_codec_ctx->flags          = AV_CODEC_FLAG_QSCALE;
+    encoder_codec_ctx->global_quality = encoder_codec_ctx->qmin * FF_QP2LAMBDA;
+ 
+    dst_frame->pts     = 1;
diff -Nru libextractor-1.6/debian/patches/series libextractor-1.6/debian/patches/series
--- libextractor-1.6/debian/patches/series	2017-12-28 16:45:33.000000000 +0000
+++ libextractor-1.6/debian/patches/series	2018-07-26 19:00:28.000000000 +0000
@@ -1,3 +1,4 @@
 update_old_m4_macro.patch
 CVE-2017-15922.patch
 CVE-2017-17440.patch
+ffmpeg4.patch
diff -Nru libextractor-1.6/debian/rules libextractor-1.6/debian/rules
--- libextractor-1.6/debian/rules	2017-12-28 16:41:56.000000000 +0000
+++ libextractor-1.6/debian/rules	2018-07-26 19:00:42.000000000 +0000
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+export CC=gcc-7
+export CXX=g++-7
+
 %:
 	dh ${@} --with autoreconf