From c993a831312cd4b6892eff88292f806d93ed4b66 Mon Sep 17 00:00:00 2001 From: Ramiro Polla Date: Mon, 16 Jul 2007 20:27:16 +0000 Subject: MinGW has gettimeofday() since mingw-runtime-3.10 Originally committed as revision 9705 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/os_support.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'libavformat/os_support.c') diff --git a/libavformat/os_support.c b/libavformat/os_support.c index 947679a143..23fc922e84 100644 --- a/libavformat/os_support.c +++ b/libavformat/os_support.c @@ -21,14 +21,11 @@ */ #include "config.h" #include "avformat.h" -#if defined(__MINGW32__) -#include -#include -#else +#if !defined(__MINGW32__) #include #include -#include #endif +#include #include #ifndef HAVE_SYS_POLL_H @@ -44,15 +41,9 @@ */ int64_t av_gettime(void) { -#if defined(__MINGW32__) - struct timeb tb; - _ftime(&tb); - return ((int64_t)tb.time * INT64_C(1000) + (int64_t)tb.millitm) * INT64_C(1000); -#else struct timeval tv; gettimeofday(&tv,NULL); return (int64_t)tv.tv_sec * 1000000 + tv.tv_usec; -#endif } #ifdef CONFIG_NETWORK -- cgit v1.2.3