RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'e737a4aaafcb1d761b7f96043c2f83ce742c64ae' 

* commit 'e737a4aaafcb1d761b7f96043c2f83ce742c64ae':
  dashenc: Change the duration fields to 64 bit

Conflicts:
	libavformat/dashenc.c

See: e65849a70b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-12-11 02:03:08 +01:00
parent 66daf3b811 e737a4aaaf
commit 7ee5f764ee
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/dashenc.c
View File

@ -444,10 +444,10 @@ static int write_manifest(AVFormatContext *s, int final)
write_time(out, c->total_duration);
avio_printf(out, "\"\n");
} else {
int update_period = c->last_duration / AV_TIME_BASE;
int64_t update_period = c->last_duration / AV_TIME_BASE;
if (c->use_template && !c->use_timeline)
update_period = 500;
avio_printf(out, "\tminimumUpdatePeriod=\"PT%dS\"\n", update_period);
avio_printf(out, "\tminimumUpdatePeriod=\"PT%"PRId64"S\"\n", update_period);
avio_printf(out, "\tsuggestedPresentationDelay=\"PT%"PRId64"S\"\n", c->last_duration / AV_TIME_BASE);
if (!c->availability_start_time[0] && s->nb_streams > 0 && c->streams[0].nb_segments > 0) {
time_t t = time(NULL);