# HG changeset patch
# User ramiro
# Date 1184617723 0
# Node ID c3d2ed2063a0ae816021a172e670411aac542544
# Parent  00cdb026030fc47a9c951b3252f9d4639dea357d
Move av_gettime() back to lavf/utils.c

diff -r 00cdb026030f -r c3d2ed2063a0 os_support.c
--- a/os_support.c	Mon Jul 16 20:27:16 2007 +0000
+++ b/os_support.c	Mon Jul 16 20:28:43 2007 +0000
@@ -25,8 +25,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #endif
-#include <sys/time.h>
-#include <time.h>
 
 #ifndef HAVE_SYS_POLL_H
 #if defined(__MINGW32__)
@@ -36,16 +34,6 @@
 #endif
 #endif
 
-/**
- * gets the current time in micro seconds.
- */
-int64_t av_gettime(void)
-{
-    struct timeval tv;
-    gettimeofday(&tv,NULL);
-    return (int64_t)tv.tv_sec * 1000000 + tv.tv_usec;
-}
-
 #ifdef CONFIG_NETWORK
 #include "network.h"
 
diff -r 00cdb026030f -r c3d2ed2063a0 utils.c
--- a/utils.c	Mon Jul 16 20:27:16 2007 +0000
+++ b/utils.c	Mon Jul 16 20:28:43 2007 +0000
@@ -23,6 +23,8 @@
 #include "opt.h"
 #include "avstring.h"
 #include "riff.h"
+#include <sys/time.h>
+#include <time.h>
 
 #undef NDEBUG
 #include <assert.h>
@@ -2498,6 +2500,16 @@
     return ret;
 }
 
+/**
+ * gets the current time in micro seconds.
+ */
+int64_t av_gettime(void)
+{
+    struct timeval tv;
+    gettimeofday(&tv,NULL);
+    return (int64_t)tv.tv_sec * 1000000 + tv.tv_usec;
+}
+
 int64_t parse_date(const char *datestr, int duration)
 {
     const char *p;