1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00

Merge commit '64034849dad8410bedbe1def4c533490fb85cc4a'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes
2016-01-02 10:25:55 +01:00
2 changed files with 47 additions and 1 deletions

View File

@@ -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"