diff options
| author | Andreas Huber <andih@google.com> | 2011-04-01 11:00:26 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2011-04-01 11:58:26 -0700 |
| commit | 79f15823c34ae1e423108295e416213200bb280f (patch) | |
| tree | 15fa170d24e1b6cd074bfc3fe4554a85eb328422 /vpx_ports/vpx_timer.h | |
| parent | 9a61bcc59a71a4a623711ef7fb43570abc73f575 (diff) | |
| download | libvpx-79f15823c34ae1e423108295e416213200bb280f.tar.gz | |
Upgrade to the latest version of libvpx pulled from the webm project's git server.
latest commit pulled from git://review.webmproject.org/libvpx.git:
82315be75d54d00ad5f2ea51f844f27f2d921dc0
Also enabled more optimizations in the neon build.
Change-Id: I744765d798471c30c2faf32af27161f772129516
Diffstat (limited to 'vpx_ports/vpx_timer.h')
| -rw-r--r-- | vpx_ports/vpx_timer.h | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/vpx_ports/vpx_timer.h b/vpx_ports/vpx_timer.h index 37a0c7cb2..c8335a0a8 100644 --- a/vpx_ports/vpx_timer.h +++ b/vpx_ports/vpx_timer.h @@ -12,6 +12,8 @@ #ifndef VPX_TIMER_H #define VPX_TIMER_H +#if CONFIG_OS_SUPPORT + #if defined(_WIN32) /* * Win32 specific includes @@ -93,5 +95,27 @@ vpx_usec_timer_elapsed(struct vpx_usec_timer *t) #endif } +#else /* CONFIG_OS_SUPPORT = 0*/ + +/* Empty timer functions if CONFIG_OS_SUPPORT = 0 */ +#ifndef timersub +#define timersub(a, b, result) +#endif + +struct vpx_usec_timer +{ + void *dummy; +}; + +static void +vpx_usec_timer_start(struct vpx_usec_timer *t) { } + +static void +vpx_usec_timer_mark(struct vpx_usec_timer *t) { } + +static long +vpx_usec_timer_elapsed(struct vpx_usec_timer *t) { return 0; } + +#endif /* CONFIG_OS_SUPPORT */ #endif |