diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-22 22:34:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-22 22:34:02 +0200 |
| commit | e847f4128543432a77fb8f85c313646a406c76f6 (patch) | |
| tree | c23fd3d3cd7904fae57c6a3e7395e10e58ae5579 /libavformat/avio.c | |
| parent | 492cc9bcc4a50b4213648c1b8dcb7c28d17ea8f7 (diff) | |
| parent | 9ee3334840c0d8564ca73dbfd6cd5a01bcdca79b (diff) | |
| download | ffmpeg-e847f4128543432a77fb8f85c313646a406c76f6.tar.gz | |
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/avio.c')
| -rw-r--r-- | libavformat/avio.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavformat/avio.c b/libavformat/avio.c index 8b7e495e55..9dca8679e3 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -19,11 +19,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <unistd.h> - #include "libavutil/avstring.h" #include "libavutil/dict.h" #include "libavutil/opt.h" +#include "libavutil/time.h" #include "os_support.h" #include "avformat.h" #if CONFIG_NETWORK @@ -268,7 +267,7 @@ static inline int retry_transfer_wrapper(URLContext *h, unsigned char *buf, int if (fast_retries) fast_retries--; else - usleep(1000); + av_usleep(1000); } else if (ret < 1) return ret < 0 ? ret : len; if (ret) |