Commit 28b7d7a3 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'b8d2630c'

* commit 'b8d2630c':
  dashenc: Reduce the segment duration if cutting out parts with edit lists
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents ae99f06e b8d2630c
......@@ -702,9 +702,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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment