[FFmpeg-cvslog] ffmpeg: move getutime to the start of the file.
Nicolas George
git at videolan.org
Thu Apr 12 10:07:06 CEST 2012
ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Wed Apr 11 19:26:29 2012 +0200| [81a9d32f0d4de14eec23160d03721eded78cdf4e] | committer: Nicolas George
ffmpeg: move getutime to the start of the file.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=81a9d32f0d4de14eec23160d03721eded78cdf4e
---
ffmpeg.c | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index 61ec3ae..3990f4f 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -416,6 +416,24 @@ typedef struct OptionsContext {
}\
}
+static int64_t getutime(void)
+{
+#if HAVE_GETRUSAGE
+ struct rusage rusage;
+
+ getrusage(RUSAGE_SELF, &rusage);
+ return (rusage.ru_utime.tv_sec * 1000000LL) + rusage.ru_utime.tv_usec;
+#elif HAVE_GETPROCESSTIMES
+ HANDLE proc;
+ FILETIME c, e, k, u;
+ proc = GetCurrentProcess();
+ GetProcessTimes(proc, &c, &e, &k, &u);
+ return ((int64_t) u.dwHighDateTime << 32 | u.dwLowDateTime) / 10;
+#else
+ return av_gettime();
+#endif
+}
+
static void reset_options(OptionsContext *o, int is_input)
{
const OptionDef *po = options;
@@ -4623,24 +4641,6 @@ static int opt_pass(const char *opt, const char *arg)
return 0;
}
-static int64_t getutime(void)
-{
-#if HAVE_GETRUSAGE
- struct rusage rusage;
-
- getrusage(RUSAGE_SELF, &rusage);
- return (rusage.ru_utime.tv_sec * 1000000LL) + rusage.ru_utime.tv_usec;
-#elif HAVE_GETPROCESSTIMES
- HANDLE proc;
- FILETIME c, e, k, u;
- proc = GetCurrentProcess();
- GetProcessTimes(proc, &c, &e, &k, &u);
- return ((int64_t) u.dwHighDateTime << 32 | u.dwLowDateTime) / 10;
-#else
- return av_gettime();
-#endif
-}
-
static int64_t getmaxrss(void)
{
#if HAVE_GETRUSAGE && HAVE_STRUCT_RUSAGE_RU_MAXRSS
More information about the ffmpeg-cvslog
mailing list