diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-29 04:34:58 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-29 05:03:57 +0300 |
| commit | 06a35804f37754e2d6ec5bdebe9d83fcddb1caf6 (patch) | |
| tree | eb14069a6843691395ed20773c8768e91a5c1153 /osdep/timer-darwin.c | |
| parent | e1ef11f0f62cac4a848a4cc9bba2f06dee8fd362 (diff) | |
| parent | 7398abf3899f953eda95d925df6bcc64b08461ed (diff) | |
| download | mpv-06a35804f37754e2d6ec5bdebe9d83fcddb1caf6.tar.bz2 mpv-06a35804f37754e2d6ec5bdebe9d83fcddb1caf6.tar.xz | |
Merge svn changes up to r26587
Conflicts:
Makefile
configure
osdep/timer-darwin.c
Diffstat (limited to 'osdep/timer-darwin.c')
| -rw-r--r-- | osdep/timer-darwin.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/osdep/timer-darwin.c b/osdep/timer-darwin.c index e087b33f12..64edfe7ef6 100644 --- a/osdep/timer-darwin.c +++ b/osdep/timer-darwin.c @@ -53,15 +53,13 @@ int usec_sleep(int usec_delay) /* current time in microseconds */ unsigned int GetTimer() { - return (unsigned int)((mach_absolute_time() * timebase_ratio) - * 1e6); + return (unsigned int)(uint64_t)(mach_absolute_time() * timebase_ratio * 1e6); } /* current time in milliseconds */ unsigned int GetTimerMS() { - return (unsigned int)((mach_absolute_time() * timebase_ratio) - * 1e3); + return (unsigned int)(uint64_t)(mach_absolute_time() * timebase_ratio * 1e3); } /* initialize timer, must be called at least once at start */ |