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.c | |
| 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.c')
| -rw-r--r-- | osdep/timer.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/osdep/timer.c b/osdep/timer.c index f75aec76f3..c624b66e70 100644 --- a/osdep/timer.c +++ b/osdep/timer.c @@ -59,16 +59,6 @@ double mp_time_sec(void) return mp_time_us() / (double)(1000 * 1000); } -int64_t mp_time_relative_us(int64_t *t) -{ - int64_t r = 0; - int64_t now = mp_time_us(); - if (*t) - r = now - *t; - *t = now; - return r; -} - int64_t mp_add_timeout(int64_t time_us, double timeout_sec) { assert(time_us > 0); // mp_time_us() returns strictly positive values |