diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-07-11 21:45:45 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-07-11 21:45:45 +0000 |
| commit | 2f30a81d192b90fd3b12f2ce40227ed74a331b6d (patch) | |
| tree | dbdaf9dd7f5862237d81bd3dec64c1572be744c0 /libavformat/os_support.c | |
| parent | 3dc7174e9dbe0d12d84b6159e6733d3865ed53f5 (diff) | |
| download | ffmpeg-2f30a81d192b90fd3b12f2ce40227ed74a331b6d.tar.gz | |
CONFIG_WIN32 implies MinGW and Cygwin and possibly more, so use just
CONFIG_MINGW or __MINGW32__ instead.
Originally committed as revision 5718 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/os_support.c')
| -rw-r--r-- | libavformat/os_support.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/os_support.c b/libavformat/os_support.c index 6f3da65f29..228f78419b 100644 --- a/libavformat/os_support.c +++ b/libavformat/os_support.c @@ -20,7 +20,7 @@ #include "avformat.h" #if defined(CONFIG_WINCE) /* Skip includes on WinCE. */ -#elif defined(CONFIG_WIN32) +#elif defined(__MINGW32__) #include <sys/types.h> #include <sys/timeb.h> #elif defined(CONFIG_OS2) @@ -40,7 +40,7 @@ int64_t av_gettime(void) { #if defined(CONFIG_WINCE) return timeGetTime() * int64_t_C(1000); -#elif defined(CONFIG_WIN32) +#elif defined(__MINGW32__) struct timeb tb; _ftime(&tb); return ((int64_t)tb.time * int64_t_C(1000) + (int64_t)tb.millitm) * int64_t_C(1000); |