summaryrefslogtreecommitdiff
path: root/libavformat/dashenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-12-30 01:50:17 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-12-30 01:50:53 +0100
commite5a3766767a104e6fdd7adcfafb8e90da5872041 (patch)
tree7210a708017ae81235dcef9f5016d16a7f5fd524 /libavformat/dashenc.c
parent8d3133f468516548af1ded06787ba481f8ae89d1 (diff)
parentb91a5757fcbf723da99b05b298a6f820271dbc2b (diff)
Merge commit 'b91a5757fcbf723da99b05b298a6f820271dbc2b'
* commit 'b91a5757fcbf723da99b05b298a6f820271dbc2b': dashenc: Fix writing of timelines that don't start at t=0 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/dashenc.c')
-rw-r--r--libavformat/dashenc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c
index e11cf69719..72d048484f 100644
--- a/libavformat/dashenc.c
+++ b/libavformat/dashenc.c
@@ -214,8 +214,10 @@ static void output_segment_list(OutputStream *os, AVIOContext *out, DASHContext
Segment *seg = os->segments[i];
int repeat = 0;
avio_printf(out, "\t\t\t\t\t\t<S ");
- if (i == start_index || seg->time != cur_time)
+ if (i == start_index || seg->time != cur_time) {
+ cur_time = seg->time;
avio_printf(out, "t=\"%"PRId64"\" ", seg->time);
+ }
avio_printf(out, "d=\"%d\" ", seg->duration);
while (i + repeat + 1 < os->nb_segments &&
os->segments[i + repeat + 1]->duration == seg->duration &&