[SCM] libav/experimental: Move av_gettime() back to lavf/utils.c

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 82e4ac2c97a1ed1e89f54b33dba502d5baaa61ab
Author: Ramiro Polla <ramiro.polla at gmail.com>
Date:   Mon Jul 16 20:28:43 2007 +0000

    Move av_gettime() back to lavf/utils.c
    
    Originally committed as revision 9706 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/os_support.c b/libavformat/os_support.c
index 23fc922..5a8bb9e 100644
--- a/libavformat/os_support.c
+++ b/libavformat/os_support.c
@@ -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 --git a/libavformat/utils.c b/libavformat/utils.c
index 401e828..5b054f6 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -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 @@ int parse_frame_rate(int *frame_rate_num, int *frame_rate_den, const char *arg)
     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;

-- 
Libav/FFmpeg packaging