diff -Nru ignition-common-1.0.1/debian/changelog ignition-common-1.0.1/debian/changelog
--- ignition-common-1.0.1/debian/changelog	2018-02-05 16:10:10.000000000 +0000
+++ ignition-common-1.0.1/debian/changelog	2018-08-08 10:00:28.000000000 +0000
@@ -1,3 +1,23 @@
+ignition-common (1.0.1-1.1build2) cosmic; urgency=medium
+
+  * Rebuild against new libtinyxml2-6a.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 08 Aug 2018 12:00:28 +0200
+
+ignition-common (1.0.1-1.1build1) cosmic; urgency=medium
+
+  * No-change rebuild for ffmpeg soname changes.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 19 Jul 2018 08:43:24 +0000
+
+ignition-common (1.0.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/patches: Fix build with ffmpeg 4.0. Thanks to James Cowgill for the
+    patch. (Closes: #896824)
+
+ -- Sebastian Ramacher <sramacher@debian.org>  Wed, 11 Jul 2018 20:59:01 +0200
+
 ignition-common (1.0.1-1) unstable; urgency=medium
 
   * Imported Upstream version 0.1.0
diff -Nru ignition-common-1.0.1/debian/patches/0005_ffmpeg4.0.patch ignition-common-1.0.1/debian/patches/0005_ffmpeg4.0.patch
--- ignition-common-1.0.1/debian/patches/0005_ffmpeg4.0.patch	1970-01-01 00:00:00.000000000 +0000
+++ ignition-common-1.0.1/debian/patches/0005_ffmpeg4.0.patch	2018-07-11 18:58:29.000000000 +0000
@@ -0,0 +1,51 @@
+Description: Fix FTBFS with FFmpeg 4.0
+Origin: upstream, https://bitbucket.org/ignitionrobotics/ign-common/commits/89d45a69d76e
+Bug: https://bitbucket.org/ignitionrobotics/ign-common/pull-requests/120
+Bug-Debian: https://bugs.debian.org/896824
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/AudioDecoder.cc
++++ b/src/AudioDecoder.cc
+@@ -257,8 +257,13 @@ bool AudioDecoder::SetFile(const std::st
+     return false;
+   }
+ 
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(56, 60, 100)
++  if (this->data->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
++    this->data->codecCtx->flags |= AV_CODEC_FLAG_TRUNCATED;
++#else
+   if (this->data->codec->capabilities & CODEC_CAP_TRUNCATED)
+     this->data->codecCtx->flags |= CODEC_FLAG_TRUNCATED;
++#endif
+ 
+   // Open codec
+   if (avcodec_open2(this->data->codecCtx, this->data->codec, nullptr) < 0)
+--- a/src/Util.cc
++++ b/src/Util.cc
+@@ -291,8 +291,10 @@ void ignition::common::load()
+   if (first)
+   {
+     first = false;
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100)
+     avcodec_register_all();
+     av_register_all();
++#endif
+ 
+ #if defined(__linux__) && defined(HAVE_AVDEVICE)
+     avdevice_register_all();
+--- a/src/Video.cc
++++ b/src/Video.cc
+@@ -164,8 +164,13 @@ bool Video::Load(const std::string &_fil
+ 
+   // Inform the codec that we can handle truncated bitstreams -- i.e.,
+   // bitstreams where frame boundaries can fall in the middle of packets
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(56, 60, 100)
++  if (codec->capabilities & AV_CODEC_CAP_TRUNCATED)
++    this->dataPtr->codecCtx->flags |= AV_CODEC_FLAG_TRUNCATED;
++#else
+   if (codec->capabilities & CODEC_CAP_TRUNCATED)
+     this->dataPtr->codecCtx->flags |= CODEC_FLAG_TRUNCATED;
++#endif
+ 
+   // Open codec
+   if (avcodec_open2(this->dataPtr->codecCtx, codec, nullptr) < 0)
diff -Nru ignition-common-1.0.1/debian/patches/series ignition-common-1.0.1/debian/patches/series
--- ignition-common-1.0.1/debian/patches/series	2018-02-05 16:10:10.000000000 +0000
+++ ignition-common-1.0.1/debian/patches/series	2018-07-11 18:58:37.000000000 +0000
@@ -2,3 +2,4 @@
 0003_use_c++11_in_gtest.patch
 0002_disable_gui_test.patch
 0004_disable_workerpool_test.patch
+0005_ffmpeg4.0.patch