diff -Nru ffmpeg-3.4/debian/changelog ffmpeg-3.4/debian/changelog
--- ffmpeg-3.4/debian/changelog	2017-11-18 10:23:47.000000000 +0000
+++ ffmpeg-3.4/debian/changelog	2017-11-18 15:23:55.000000000 +0000
@@ -1,3 +1,10 @@
+ffmpeg (7:3.4-2ubuntu2) bionic; urgency=medium
+
+  * Revert the last change.
+  * Pull https://ffmpeg.org/pipermail/ffmpeg-devel/2017-November/220192.html
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 18 Nov 2017 16:23:55 +0100
+
 ffmpeg (7:3.4-2ubuntu1) bionic; urgency=medium
 
   * Try to build with -O2 on s390x.
diff -Nru ffmpeg-3.4/debian/patches/big-endian-fix.diff ffmpeg-3.4/debian/patches/big-endian-fix.diff
--- ffmpeg-3.4/debian/patches/big-endian-fix.diff	1970-01-01 00:00:00.000000000 +0000
+++ ffmpeg-3.4/debian/patches/big-endian-fix.diff	2017-11-18 15:23:10.000000000 +0000
@@ -0,0 +1,25 @@
+In the DASHContext structure, min_seg_duration is declared as an int,
+but the AVOption list claimed it was an INT64. Change the option list
+to use the correct size, which should fix some initialization errors
+seen on big-endian platforms.
+
+Signed-off-by: James Cowgill <jcowgill at debian.org>
+---
+ libavformat/dashenc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c
+index d5554d1df0..ddad3351fd 100644
+--- a/libavformat/dashenc.c
++++ b/libavformat/dashenc.c
+@@ -1181,7 +1181,7 @@ static const AVOption options[] = {
+     { "adaptation_sets", "Adaptation sets. Syntax: id=0,streams=0,1,2 id=1,streams=3,4 and so on", OFFSET(adaptation_sets), AV_OPT_TYPE_STRING, { 0 }, 0, 0, AV_OPT_FLAG_ENCODING_PARAM },
+     { "window_size", "number of segments kept in the manifest", OFFSET(window_size), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, E },
+     { "extra_window_size", "number of segments kept outside of the manifest before removing from disk", OFFSET(extra_window_size), AV_OPT_TYPE_INT, { .i64 = 5 }, 0, INT_MAX, E },
+-    { "min_seg_duration", "minimum segment duration (in microseconds)", OFFSET(min_seg_duration), AV_OPT_TYPE_INT64, { .i64 = 5000000 }, 0, INT_MAX, E },
++    { "min_seg_duration", "minimum segment duration (in microseconds)", OFFSET(min_seg_duration), AV_OPT_TYPE_INT, { .i64 = 5000000 }, 0, INT_MAX, E },
+     { "remove_at_exit", "remove all segments when finished", OFFSET(remove_at_exit), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, E },
+     { "use_template", "Use SegmentTemplate instead of SegmentList", OFFSET(use_template), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, E },
+     { "use_timeline", "Use SegmentTimeline in SegmentTemplate", OFFSET(use_timeline), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, E },
+-- 
+2.15.0
diff -Nru ffmpeg-3.4/debian/patches/series ffmpeg-3.4/debian/patches/series
--- ffmpeg-3.4/debian/patches/series	2017-11-09 16:13:48.000000000 +0000
+++ ffmpeg-3.4/debian/patches/series	2017-11-18 15:23:48.000000000 +0000
@@ -1,3 +1,4 @@
 0001-arm-thumb2-blx.patch
 0002-arm-Check-for-have_vfp_vm-instead-of-have_vfpv3.patch
 0003-lavc-reset-codec-on-receiving-packet-after-EOF-in-co.patch
+big-endian-fix.diff