virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

Collapse getutime into one declaration

Browse Source 
Originally committed as revision 9628 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ramiro Polla 2007-07-13 16:05:36 +00:00
parent 66be5b4536
commit 7829950cf2
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ffmpeg.c
View File

@ -3105,12 +3105,6 @@ static void opt_pass(const char *pass_str)
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;