From: Michael Niedermayer Date: Wed, 3 Sep 2014 12:24:53 +0000 (+0200) Subject: Merge commit 'ebef9f5a56d7df91e010a177a80cfc8dbe394305' X-Git-Tag: android-x86-6.0-r1~3272 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dc81c0a0dc7b3f766e5a511a7fab47d61f8a9c03;p=android-x86%2Fexternal-ffmpeg.git Merge commit 'ebef9f5a56d7df91e010a177a80cfc8dbe394305' * commit 'ebef9f5a56d7df91e010a177a80cfc8dbe394305': 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: Michael Niedermayer --- dc81c0a0dc7b3f766e5a511a7fab47d61f8a9c03 diff --cc configure index 8f0b915577,af0128a241..b1814db238 --- a/configure +++ b/configure @@@ -4654,8 -4039,9 +4654,8 @@@ check_func_headers malloc.h _aligned_ma check_func ${malloc_prefix}memalign && enable memalign check_func ${malloc_prefix}posix_memalign && enable posix_memalign -check_cpp_condition unistd.h "defined(_POSIX_MONOTONIC_CLOCK)" && - check_func_headers time.h clock_gettime || { check_func_headers time.h clock_gettime -lrt && add_extralibs -lrt; } - +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 fork check_func gethrtime