diff options
| author | François Revol <revol@free.fr> | 2002-12-20 21:04:08 +0000 |
|---|---|---|
| committer | François Revol <revol@free.fr> | 2002-12-20 21:04:08 +0000 |
| commit | 8ff323888ccc2051f62c5b06d772b6df819710bc (patch) | |
| tree | ff8a873227be53c7333eb18bea78fefb118aa91a /libavformat/img.c | |
| parent | 40d05a6bce5293a2ed11323a0486c150ec34e4da (diff) | |
| download | ffmpeg-8ff323888ccc2051f62c5b06d772b6df819710bc.tar.gz | |
redid usleep() fix for BeOS, more consistant with the MINGW32 one. removed a TAB :P
Originally committed as revision 1349 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/img.c')
| -rw-r--r-- | libavformat/img.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/libavformat/img.c b/libavformat/img.c index 838db9a2ef..6afcb4e029 100644 --- a/libavformat/img.c +++ b/libavformat/img.c @@ -17,9 +17,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <unistd.h> -#ifdef __BEOS__ -# include <OS.h> -#endif #include "avformat.h" extern AVInputFormat pgm_iformat; @@ -40,7 +37,13 @@ extern AVOutputFormat yuv4mpegpipe_oformat; #ifdef __MINGW32__ # include <windows.h> -# define usleep(t) Sleep((t) / 1000) +# define usleep(t) Sleep((t) / 1000) +#endif +#ifdef __BEOS__ +# ifndef usleep +# include <OS.h> +# define usleep(t) snooze((bigtime_t)(t)) +# endif #endif #define IMGFMT_YUV 1 @@ -215,11 +218,7 @@ static int img_read_packet(AVFormatContext *s1, AVPacket *pkt) pts = ((INT64)s->img_number * FRAME_RATE_BASE * 1000000) / (s1->streams[0]->codec.frame_rate); if (pts > nowus) -#ifdef __BEOS__ - snooze((bigtime_t)(pts - nowus)); -#else usleep(pts - nowus); -#endif } } |