repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian version 2.5.0~trusty1.1
[deb_ffmpeg.git]
/
ffmpeg
/
libavformat
/
hlsproto.c
diff --git
a/ffmpeg/libavformat/hlsproto.c
b/ffmpeg/libavformat/hlsproto.c
index e607c10e210199bfa718376e93273145376372fd..a569e9224e95162badb7688137a3ada0c26a41ea 100644
(file)
--- a/
ffmpeg/libavformat/hlsproto.c
+++ b/
ffmpeg/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);
fail:
avio_close(in);
@@
-273,7
+273,7
@@
start:
s->target_duration;
retry:
if (!s->finished) {
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;
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;
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);
if (ff_check_interrupt(&h->interrupt_callback))
return AVERROR_EXIT;
av_usleep(100*1000);