diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:07:09 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:57:31 +0200 |
commit | 9bcd12fdf5c6f85e9bb391caa2713021624a957e (patch) | |
tree | 375eac533ead90a45e7121e5ab307861b4ef52c8 /osdep/timer-win2.c | |
parent | d419ecd161634e79dab3ac57d57c4bccba2adcdc (diff) | |
parent | e0d66b140e1da7a793bff15003cadab79544b1dd (diff) | |
download | mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.bz2 mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.xz |
Merge svn changes up to r28310
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
Diffstat (limited to 'osdep/timer-win2.c')
-rw-r--r-- | osdep/timer-win2.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/osdep/timer-win2.c b/osdep/timer-win2.c index 43c4b07fa9..3c6b86afa4 100644 --- a/osdep/timer-win2.c +++ b/osdep/timer-win2.c @@ -7,12 +7,14 @@ const char timer_name[] = "Windows native"; // Returns current time in microseconds -unsigned int GetTimer(){ +unsigned int GetTimer(void) +{ return timeGetTime() * 1000; } // Returns current time in milliseconds -unsigned int GetTimerMS(){ +unsigned int GetTimerMS(void) +{ return timeGetTime() ; } @@ -25,5 +27,6 @@ int usec_sleep(int usec_delay){ return 0; } -void InitTimer(){ +void InitTimer(void) +{ } |