diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-23 00:34:02 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-23 00:34:02 +0400 |
commit | e847f4128543432a77fb8f85c313646a406c76f6 (patch) | |
tree | c23fd3d3cd7904fae57c6a3e7395e10e58ae5579 /libavformat/hls.c | |
parent | 492cc9bcc4a50b4213648c1b8dcb7c28d17ea8f7 (diff) | |
parent | 9ee3334840c0d8564ca73dbfd6cd5a01bcdca79b (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libspeexenc: add supported sample rates and channel layouts.
Replace usleep() calls with av_usleep()
lavu: add av_usleep() function
utvideo: mark interlaced frames as such
utvideo: Fix interlaced prediction for RGB utvideo.
cosmetics: do not use full path for local headers
lavu/file: include unistd.h only when available
configure: check for unistd.h
log: include unistd.h only when needed
lavf: include libavutil/time.h instead of redeclaring av_gettime()
Conflicts:
configure
doc/APIchanges
ffmpeg.c
ffplay.c
libavcodec/utvideo.c
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/hls.c')
-rw-r--r-- | libavformat/hls.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/hls.c b/libavformat/hls.c index 4b5cd07422..40c417a199 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -30,9 +30,9 @@ #include "libavutil/mathematics.h" #include "libavutil/opt.h" #include "libavutil/dict.h" +#include "libavutil/time.h" #include "avformat.h" #include "internal.h" -#include <unistd.h> #include "avio_internal.h" #include "url.h" @@ -407,7 +407,7 @@ reload: while (av_gettime() - v->last_load_time < reload_interval) { if (ff_check_interrupt(c->interrupt_callback)) return AVERROR_EXIT; - usleep(100*1000); + av_usleep(100*1000); } /* Enough time has elapsed since the last reload */ goto reload; |