[FFmpeg-cvslog] Merge commit 'ebef9f5a56d7df91e010a177a80cfc8dbe394305'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep  3 14:24:53 2014 +0200| [dc81c0a0dc7b3f766e5a511a7fab47d61f8a9c03] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dc81c0a0dc7b3f766e5a511a7fab47d61f8a9c03
---