From b8d2630c5327d2818d05c8a48be0417905d8e0fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Sun, 10 May 2015 10:05:37 +0300 Subject: [PATCH] dashenc: Reduce the segment duration if cutting out parts with edit lists MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes sure that the time + duration of the first segment matches the start time of the next segment for e.g. AAC audio with encoder delay. Signed-off-by: Martin Storsjö --- libavformat/dashenc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index f228b86000..cedd83b67b 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -696,9 +696,11 @@ static int add_segment(OutputStream *os, const char *file, return AVERROR(ENOMEM); av_strlcpy(seg->file, file, sizeof(seg->file)); seg->time = time; - if (seg->time < 0) // If pts<0, it is expected to be cut away with an edit list - seg->time = 0; seg->duration = duration; + if (seg->time < 0) { // If pts<0, it is expected to be cut away with an edit list + seg->duration += seg->time; + seg->time = 0; + } seg->start_pos = start_pos; seg->range_length = range_length; seg->index_length = index_length;