generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'b91a5757fcbf723da99b05b298a6f820271dbc2b'

Browse Source 
* commit 'b91a5757fcbf723da99b05b298a6f820271dbc2b':
  dashenc: Fix writing of timelines that don't start at t=0

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-12-30 01:50:17 +01:00
parent 8d3133f468 b91a5757fc
commit e5a3766767
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/dashenc.c
View File

@@ -214,8 +214,10 @@ static void output_segment_list(OutputStream *os, AVIOContext *out, DASHContext
Segment *seg = os->segments[i]; Segment *seg = os->segments[i];
int repeat = 0; int repeat = 0;
avio_printf(out, "\t\t\t\t\t\t<S "); 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, "t=\"%"PRId64"\" ", seg->time);
}
avio_printf(out, "d=\"%d\" ", seg->duration); avio_printf(out, "d=\"%d\" ", seg->duration);
while (i + repeat + 1 < os->nb_segments && while (i + repeat + 1 < os->nb_segments &&
os->segments[i + repeat + 1]->duration == seg->duration && os->segments[i + repeat + 1]->duration == seg->duration &&