Commit 23cfca21 authored by ramiro's avatar ramiro

Collapse getutime into one declaration

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@9628 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 49386ee2
...@@ -3105,12 +3105,6 @@ static void opt_pass(const char *pass_str) ...@@ -3105,12 +3105,6 @@ static void opt_pass(const char *pass_str)
do_pass = pass; do_pass = pass;
} }
#if defined(__MINGW32__)
static int64_t getutime(void)
{
return av_gettime();
}
#else
static int64_t getutime(void) static int64_t getutime(void)
{ {
#ifdef HAVE_GETRUSAGE #ifdef HAVE_GETRUSAGE
...@@ -3118,9 +3112,10 @@ static int64_t getutime(void) ...@@ -3118,9 +3112,10 @@ static int64_t getutime(void)
getrusage(RUSAGE_SELF, &rusage); getrusage(RUSAGE_SELF, &rusage);
return (rusage.ru_utime.tv_sec * 1000000LL) + rusage.ru_utime.tv_usec; return (rusage.ru_utime.tv_sec * 1000000LL) + rusage.ru_utime.tv_usec;
#elif defined(__MINGW32__)
return av_gettime();
#endif #endif
} }
#endif
#if defined(CONFIG_FFM_DEMUXER) || defined(CONFIG_FFM_MUXER) #if defined(CONFIG_FFM_DEMUXER) || defined(CONFIG_FFM_MUXER)
extern int ffm_nopts; extern int ffm_nopts;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment