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/hls.c | |
| parent | d0c093021943e9b9c23528b12cd61ca2a5b01b4f (diff) | |
| download | ffmpeg-6df9d9b55d3f56ee7782639a7678eeeaf77f14ea.tar.gz | |
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/hls.c')
| -rw-r--r-- | libavformat/hls.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/hls.c b/libavformat/hls.c index 290f12e5bb..8b52a35508 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -320,7 +320,7 @@ static int parse_playlist(HLSContext *c, const char *url, } } if (var) - var->last_load_time = av_gettime(); + var->last_load_time = av_gettime_relative(); fail: av_free(new_url); @@ -392,7 +392,7 @@ restart: reload: if (!v->finished && - av_gettime() - v->last_load_time >= reload_interval) { + av_gettime_relative() - v->last_load_time >= reload_interval) { if ((ret = parse_playlist(c, v->url, v, NULL)) < 0) return ret; /* If we need to reload the playlist again below (if @@ -409,7 +409,7 @@ reload: if (v->cur_seq_no >= v->start_seq_no + v->n_segments) { if (v->finished) return AVERROR_EOF; - while (av_gettime() - v->last_load_time < reload_interval) { + while (av_gettime_relative() - v->last_load_time < reload_interval) { if (ff_check_interrupt(c->interrupt_callback)) return AVERROR_EXIT; av_usleep(100*1000); |