[SCM] ffmpeg/master: Add patch to fix dash muxer autopkgtest errors on big-endian

[jcowgill at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c51d8a679f9a650c6eb499ced8b247f0b13acd94
Author: James Cowgill <jcowgill at debian.org>
Date:   Sat Nov 18 15:38:19 2017 +0000

    Add patch to fix dash muxer autopkgtest errors on big-endian

diff --git a/debian/patches/0004-avformat-dashenc-fix-min_seg_duration-option-size.patch b/debian/patches/0004-avformat-dashenc-fix-min_seg_duration-option-size.patch
new file mode 100644
index 0000000..71d3382
--- /dev/null
+++ b/debian/patches/0004-avformat-dashenc-fix-min_seg_duration-option-size.patch
@@ -0,0 +1,31 @@
+From 7dff5e53fe875d847edfc82f18ba8e72ec90992c Mon Sep 17 00:00:00 2001
+From: James Cowgill <jcowgill at debian.org>
+Date: Sat, 18 Nov 2017 14:49:31 +0000
+Subject: [PATCH] avformat/dashenc: fix min_seg_duration option size
+
+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 --git a/debian/patches/series b/debian/patches/series
index 7ecd120..dd8059d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -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
+0004-avformat-dashenc-fix-min_seg_duration-option-size.patch

-- 
ffmpeg packaging