Merge commit 'ebef9f5a56d7df91e010a177a80cfc8dbe394305'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Sep 2014 12:24:53 +0000 (14:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Sep 2014 12:24:53 +0000 (14:24 +0200)
commitdc81c0a0dc7b3f766e5a511a7fab47d61f8a9c03
treedde0c8e64d97fef7179d1f34130e2d186915d404
parent7509a95656cd0bf663ee2654763d8840d1662a88
parentebef9f5a56d7df91e010a177a80cfc8dbe394305
Merge commit 'ebef9f5a56d7df91e010a177a80cfc8dbe394305'

* commit 'ebef9f5a56d7df91e010a177a80cfc8dbe394305':
  time: Use clock_gettime if the monotonic clock is available

Conflicts:
configure

The change to av_gettime() isnt merged, a patch will be posted to the mailing list
that would do the switch

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure