diff options
author | Martin Storsjö <martin@martin.st> | 2014-10-22 12:40:46 +0300 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2014-10-24 09:53:45 +0300 |
commit | 6df9d9b55d3f56ee7782639a7678eeeaf77f14ea (patch) | |
tree | 03a66a094e1c9803a25bbd244adcd7c01269655d /libavformat/hlsproto.c | |
parent | d0c093021943e9b9c23528b12cd61ca2a5b01b4f (diff) |
lavf: Use av_gettime_relative
The ones left using av_gettime are NTP timestamps (for RTCP,
which is specified to send the actual current realtime clock
in RTCP SR packets), and the NUT muxer timestamper, which is
documented as using wallclock time.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/hlsproto.c')
-rw-r--r-- | libavformat/hlsproto.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/hlsproto.c b/libavformat/hlsproto.c index ec357de94f..751fef2e4d 100644 --- a/libavformat/hlsproto.c +++ b/libavformat/hlsproto.c @@ -169,7 +169,7 @@ static int parse_playlist(URLContext *h, const char *url) } } } - s->last_load_time = av_gettime(); + s->last_load_time = av_gettime_relative(); fail: avio_close(in); @@ -273,7 +273,7 @@ start: s->target_duration; retry: if (!s->finished) { - int64_t now = av_gettime(); + int64_t now = av_gettime_relative(); if (now - s->last_load_time >= reload_interval) { if ((ret = parse_playlist(h, s->playlisturl)) < 0) return ret; @@ -292,7 +292,7 @@ retry: if (s->cur_seq_no - s->start_seq_no >= s->n_segments) { if (s->finished) return AVERROR_EOF; - while (av_gettime() - s->last_load_time < reload_interval) { + while (av_gettime_relative() - s->last_load_time < reload_interval) { if (ff_check_interrupt(&h->interrupt_callback)) return AVERROR_EXIT; av_usleep(100*1000); |