summaryrefslogtreecommitdiff
path: root/libavutil/timer.h
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2009-04-01 22:56:26 +0000
committerMåns Rullgård <mans@mansr.com>2009-04-01 22:56:26 +0000
commit60c703ac4bb18d69acaa93264d647c186c972486 (patch)
tree3002a70b78a28ef5531f22c87469958337fcc0b1 /libavutil/timer.h
parent439ccc4e0e7965d682907882116a5d18e83e1292 (diff)
ARM: START/STOP_TIMER support for ARMv7
Originally committed as revision 18305 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil/timer.h')
-rw-r--r--libavutil/timer.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavutil/timer.h b/libavutil/timer.h
index 78342d7d58..db0abaec68 100644
--- a/libavutil/timer.h
+++ b/libavutil/timer.h
@@ -28,7 +28,9 @@
#include <stdint.h>
#include "config.h"
-#if ARCH_BFIN
+#if ARCH_ARM
+# include "arm/timer.h"
+#elif ARCH_BFIN
# include "bfin/timer.h"
#elif ARCH_PPC
# include "ppc/timer.h"