[SCM] libav/experimental: MinGW has gettimeofday() since mingw-runtime-3.10
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:03:55 UTC 2013
The following commit has been merged in the experimental branch:
commit c993a831312cd4b6892eff88292f806d93ed4b66
Author: Ramiro Polla <ramiro.polla at gmail.com>
Date: Mon Jul 16 20:27:16 2007 +0000
MinGW has gettimeofday() since mingw-runtime-3.10
Originally committed as revision 9705 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/os_support.c b/libavformat/os_support.c
index 947679a..23fc922 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 <sys/types.h>
-#include <sys/timeb.h>
-#else
+#if !defined(__MINGW32__)
#include <unistd.h>
#include <fcntl.h>
-#include <sys/time.h>
#endif
+#include <sys/time.h>
#include <time.h>
#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
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list