redid usleep() fix for BeOS, more consistant with the MINGW32 one. removed a TAB :P
authorFrançois Revol <revol@free.fr>
Fri, 20 Dec 2002 21:04:08 +0000 (21:04 +0000)
committerFrançois Revol <revol@free.fr>
Fri, 20 Dec 2002 21:04:08 +0000 (21:04 +0000)
Originally committed as revision 1349 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavformat/img.c

index 838db9a2ef1aa570e92ecf355ea6b01f947c1a2e..6afcb4e0298badb2e1166869c1493152f84f4745 100644 (file)
@@ -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
         }
     }