]> git.sesse.net Git - ffmpeg/commitdiff
avutil/timer: Fix units for x86 after c708b5403346255ea5adc776645616cc7c61f078
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 14:14:33 +0000 (15:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 14:22:02 +0000 (15:22 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/timer.h
libavutil/x86/timer.h

index 49e92fdfee44777affd217b93d58a2355ec341a9..3fff77ff1c689d0dcd9778eaebe308e316f94468 100644 (file)
 #   endif
 #endif
 
+#ifndef FF_TIMER_UNITS
+#   define FF_TIMER_UNITS "UNITS"
+#endif
+
 #ifdef AV_READ_TIME
 #define START_TIMER                             \
     uint64_t tend;                              \
@@ -76,7 +80,7 @@
             tskip_count++;                                                \
         if (((tcount + tskip_count) & (tcount + tskip_count - 1)) == 0) { \
             av_log(NULL, AV_LOG_ERROR,                                    \
-                   "%"PRIu64" UNITS in %s, %d runs, %d skips\n",          \
+                   "%"PRIu64" " FF_TIMER_UNITS " in %s, %d runs, %d skips\n",          \
                    tsum * 10 / tcount, id, tcount, tskip_count);          \
         }                                                                 \
     }
index d812d46aed3eca696d8a65928032eb8a7af42774..5b24b511c1f55db43c52eda47a01294967fdb44a 100644 (file)
@@ -25,6 +25,7 @@
 
 #if HAVE_INLINE_ASM
 
+#define FF_TIMER_UNITS "decicycles"
 #define AV_READ_TIME read_time
 
 static inline uint64_t read_time(void)