[FFmpeg-cvslog] r9628 - trunk/ffmpeg.c

[ramiro]

Author: ramiro
Date: Fri Jul 13 18:05:36 2007
New Revision: 9628

Log:
Collapse getutime into one declaration

Modified:
   trunk/ffmpeg.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	(original)
+++ trunk/ffmpeg.c	Fri Jul 13 18:05:36 2007
@@ -3105,12 +3105,6 @@ static void opt_pass(const char *pass_st
     do_pass = pass;
 }
 
-#if defined(__MINGW32__)
-static int64_t getutime(void)
-{
-  return av_gettime();
-}
-#else
 static int64_t getutime(void)
 {
 #ifdef HAVE_GETRUSAGE
@@ -3118,9 +3112,10 @@ static int64_t getutime(void)
 
     getrusage(RUSAGE_SELF, &rusage);
     return (rusage.ru_utime.tv_sec * 1000000LL) + rusage.ru_utime.tv_usec;
+#elif defined(__MINGW32__)
+  return av_gettime();
 #endif
 }
-#endif
 
 #if defined(CONFIG_FFM_DEMUXER) || defined(CONFIG_FFM_MUXER)
 extern int ffm_nopts;