Merge commit '64034849dad8410bedbe1def4c533490fb85cc4a'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 2 Jan 2016 09:25:55 +0000 (10:25 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 2 Jan 2016 09:26:42 +0000 (10:26 +0100)
commitaf2e6f32156ecd18664551215680c662e61aa57a
tree229c8c88bbd6d295f658cd39cd13f572e17b5567
parent4cf66a81932a1f3775b8952ebe010be067990674
parent64034849dad8410bedbe1def4c533490fb85cc4a
Merge commit '64034849dad8410bedbe1def4c533490fb85cc4a'

* commit '64034849dad8410bedbe1def4c533490fb85cc4a':
  arm64: add cycle counter support

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavutil/aarch64/timer.h
libavutil/timer.h