avutil/timer: Fix units for x86 after c708b54033

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/293/head
Michael Niedermayer 11 years ago
parent c2923100f5
commit 4159f702a7
  1. 6
      libavutil/timer.h
  2. 1
      libavutil/x86/timer.h

@ -56,6 +56,10 @@
# 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); \
} \
}

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

Loading…
Cancel
Save