diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-11 02:03:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-11 02:03:47 +0100 |
| commit | 7ee5f764ee6cbdff67e04f7959acedff80fcd59b (patch) | |
| tree | c07fd8a0fe99577444e451e71a7005d4c1201b3b /libavformat/dashenc.c | |
| parent | 66daf3b81154078852a049b44fc477d5195cd0f5 (diff) | |
| parent | e737a4aaafcb1d761b7f96043c2f83ce742c64ae (diff) | |
| download | ffmpeg-7ee5f764ee6cbdff67e04f7959acedff80fcd59b.tar.gz | |
Merge commit 'e737a4aaafcb1d761b7f96043c2f83ce742c64ae'
* commit 'e737a4aaafcb1d761b7f96043c2f83ce742c64ae':
dashenc: Change the duration fields to 64 bit
Conflicts:
libavformat/dashenc.c
See: e65849a70bfb401306038d41ebd8b5750deb3cfd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/dashenc.c')
| -rw-r--r-- | libavformat/dashenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index dcf8eee72b..e8823119ed 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -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); |