diff options
author | Anton Kindestam <antonki@kth.se> | 2018-12-05 19:02:03 +0100 |
---|---|---|
committer | Anton Kindestam <antonki@kth.se> | 2018-12-05 19:19:24 +0100 |
commit | 8b83c8996686072bc743b112ae5cb3bf93aa33ed (patch) | |
tree | b09ce6a7ff470b05006622f19914b3d39d2f7d9f /osdep/timer.h | |
parent | 5bcac8580df6fc62323136f756a3a6d1e754fe9c (diff) | |
parent | 559a400ac36e75a8d73ba263fd7fa6736df1c2da (diff) | |
download | mpv-8b83c8996686072bc743b112ae5cb3bf93aa33ed.tar.bz2 mpv-8b83c8996686072bc743b112ae5cb3bf93aa33ed.tar.xz |
Merge commit '559a400ac36e75a8d73ba263fd7fa6736df1c2da' into wm4-commits--merge-edition
This bumps libmpv version to 1.103
Diffstat (limited to 'osdep/timer.h')
-rw-r--r-- | osdep/timer.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/osdep/timer.h b/osdep/timer.h index b4a64c7820..78457d9b9a 100644 --- a/osdep/timer.h +++ b/osdep/timer.h @@ -39,12 +39,6 @@ void mp_sleep_us(int64_t us); #define MP_START_TIME 10000000 -// Return the amount of time that has passed since the last call, in -// microseconds. *t is used to calculate the time that has passed by storing -// the current time in it. If *t is 0, the call will return 0. (So that the -// first call will return 0, instead of the absolute current time.) -int64_t mp_time_relative_us(int64_t *t); - // Add a time in seconds to the given time in microseconds, and return it. // Takes care of possible overflows. Never returns a negative or 0 time. int64_t mp_add_timeout(int64_t time_us, double timeout_sec); |