diff options
author | François Revol <revol@free.fr> | 2003-03-12 17:14:28 +0000 |
---|---|---|
committer | François Revol <revol@free.fr> | 2003-03-12 17:14:28 +0000 |
commit | d4ad24c17ddf296aadfe34404caa461244babb27 (patch) | |
tree | 4df1c55ff16b0f2c92ad3e61cdf07b1e93e1d571 | |
parent | 49313ba4c1c14aab308d4111b462e42a57a23a26 (diff) | |
download | ffmpeg-streaming-d4ad24c17ddf296aadfe34404caa461244babb27.zip ffmpeg-streaming-d4ad24c17ddf296aadfe34404caa461244babb27.tar.gz |
Cleaner support for usleep()
Originally committed as revision 1668 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | ffmpeg.c | 3 | ||||
-rw-r--r-- | libavformat/img.c | 16 |
2 files changed, 3 insertions, 16 deletions
@@ -20,6 +20,8 @@ #include "common.h" #include "avformat.h" #include "framehook.h" +/* usleep() */ +#include "os_support.h" #ifndef CONFIG_WIN32 #include <unistd.h> @@ -33,7 +35,6 @@ #include <sys/types.h> #include <sys/select.h> #include <stdlib.h> -#define usleep(t) _sleep2((t)/1000) #endif #include <time.h> #include <ctype.h> diff --git a/libavformat/img.c b/libavformat/img.c index 36e501f..980f4f9 100644 --- a/libavformat/img.c +++ b/libavformat/img.c @@ -18,21 +18,7 @@ */ #include <unistd.h> #include "avformat.h" - -#ifdef __MINGW32__ -# include <windows.h> -# define usleep(t) Sleep((t) / 1000) -#endif -#ifdef __BEOS__ -# ifndef usleep -# include <OS.h> -# define usleep(t) snooze((bigtime_t)(t)) -# endif -#endif -#if defined(CONFIG_OS2) -# include <stdlib.h> -# define usleep(t) _sleep2((t) / 1000) -#endif +#include "../os_support.h" typedef struct { int width; |