Commit dc81c0a0 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'ebef9f5a'

* commit 'ebef9f5a':
  time: Use clock_gettime if the monotonic clock is available

Conflicts:
	configure

The change to av_gettime() isnt merged, a patch will be posted to the mailing list
that would do the switch
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 7509a956 ebef9f5a
...@@ -4655,7 +4655,7 @@ check_func ${malloc_prefix}memalign && enable memalign ...@@ -4655,7 +4655,7 @@ check_func ${malloc_prefix}memalign && enable memalign
check_func ${malloc_prefix}posix_memalign && enable posix_memalign check_func ${malloc_prefix}posix_memalign && enable posix_memalign
check_func access check_func access
check_func clock_gettime || { check_func clock_gettime -lrt && add_extralibs -lrt; } check_func_headers time.h clock_gettime || { check_func_headers time.h clock_gettime -lrt && add_extralibs -lrt; }
check_func fcntl check_func fcntl
check_func fork check_func fork
check_func gethrtime check_func gethrtime
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment