diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-02 10:25:55 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-02 10:26:42 +0100 |
| commit | af2e6f32156ecd18664551215680c662e61aa57a (patch) | |
| tree | 229c8c88bbd6d295f658cd39cd13f572e17b5567 /libavutil/timer.h | |
| parent | 4cf66a81932a1f3775b8952ebe010be067990674 (diff) | |
| parent | 64034849dad8410bedbe1def4c533490fb85cc4a (diff) | |
| download | ffmpeg-af2e6f32156ecd18664551215680c662e61aa57a.tar.gz | |
Merge commit '64034849dad8410bedbe1def4c533490fb85cc4a'
* commit '64034849dad8410bedbe1def4c533490fb85cc4a':
arm64: add cycle counter support
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavutil/timer.h')
| -rw-r--r-- | libavutil/timer.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavutil/timer.h b/libavutil/timer.h index e21f6552bd..ed3b047870 100644 --- a/libavutil/timer.h +++ b/libavutil/timer.h @@ -38,7 +38,9 @@ #include "log.h" -#if ARCH_ARM +#if ARCH_AARCH64 +# include "aarch64/timer.h" +#elif ARCH_ARM # include "arm/timer.h" #elif ARCH_PPC # include "ppc/timer.h" |