Merge commit 'b46900914a1f25ce8dbf49d7c53766ff1f18b60f'
authorJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 19:42:27 +0000 (16:42 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 19:42:27 +0000 (16:42 -0300)
commit4e754e94195b21b49f37471d29841cff2562e320
treebfb8d08f0cd41c27da432dfe84f5c6c7bf51de71
parent28e012234a9bf9118a69a324de6392ce64fb65d2
parentb46900914a1f25ce8dbf49d7c53766ff1f18b60f
Merge commit 'b46900914a1f25ce8dbf49d7c53766ff1f18b60f'

* commit 'b46900914a1f25ce8dbf49d7c53766ff1f18b60f':
  build: Merge mach/mach_time.h and mach_absolute_time() checks

Merged-by: James Almer <jamrial@gmail.com>
configure
libavutil/timer.h