[FFmpeg-cvslog] Merge commit 'c708b5403346255ea5adc776645616cc7c61f078'

Michael Niedermayer git at videolan.org
Sun Mar 9 15:23:31 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar  9 14:30:24 2014 +0100| [c2923100f5a1199c46d5bc351fb3371956d1b90c] | committer: Michael Niedermayer

Merge commit 'c708b5403346255ea5adc776645616cc7c61f078'

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

Conflicts:
	configure

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

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





More information about the ffmpeg-cvslog mailing list