← Back to branch summary

~ubuntu-branches/ubuntu/vivid/ffmpeg/vivid

« back to all changes in this revision

Viewing changes to libavutil/x86/timer.h

  • Committer: Package Import Robot
  • Author(s): Andreas Cadhalpun
  • Date: 2014-11-05 01:18:23 UTC
  • mfrom: (0.2.17 sid)
  • Revision ID: package-import@ubuntu.com-20141105011823-xsbeceffs43wtkn7
Tags: 7:2.4.3-1
* Import new upstream bugfix release 2.4.3.
   - Refresh Change-symbol-versioning.patch.
   - Add new symbols to the libavdevice symbols file.
* Enable libbs2b on arm64, since it is now available.
* Disable frei0r and libx264 on x32, libsoxr and openal on sparc64
  and libopencv on m68k, sh4, sparc64 and x32, because they are not
  (yet) avialable there.
* Disable assembler optimizations on x32, as they wouldn't work there.
* Include config.log in the build-log, when compiling fails.
* Add fix-hppa-tests.patch to work around a gcc bug on hppa.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavutil/x86/timer.h
23
23
 
24
24
#include <stdint.h>
25
25
 
 
26
#if HAVE_INLINE_ASM
 
27
 
 
28
#define FF_TIMER_UNITS "decicycles"
26
29
#define AV_READ_TIME read_time
27
30
 
28
31
static inline uint64_t read_time(void)
32
35
    return ((uint64_t)d << 32) + a;
33
36
}
34
37
 
 
38
#elif HAVE_RDTSC
 
39
 
 
40
#include <intrin.h>
 
41
#define AV_READ_TIME __rdtsc
 
42
 
 
43
#endif /* HAVE_INLINE_ASM */
 
44
 
35
45
#endif /* AVUTIL_X86_TIMER_H */