Merge commit 'c708b5403346255ea5adc776645616cc7c61f078'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 13:30:24 +0000 (14:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 13:30:24 +0000 (14:30 +0100)
commitc2923100f5a1199c46d5bc351fb3371956d1b90c
treecb41bb2dbab5fdd3795a3343e17f1ac231d62c0a
parentfa4f57399774b7c09c5978652b2eaea77f8851e1
parentc708b5403346255ea5adc776645616cc7c61f078
Merge commit 'c708b5403346255ea5adc776645616cc7c61f078'

* commit 'c708b5403346255ea5adc776645616cc7c61f078':
  timer: use mach_absolute_time as high resolution clock on darwin

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavutil/timer.h