diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 14:24:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 14:24:53 +0200 |
| commit | dc81c0a0dc7b3f766e5a511a7fab47d61f8a9c03 (patch) | |
| tree | dde0c8e64d97fef7179d1f34130e2d186915d404 | |
| parent | 7509a95656cd0bf663ee2654763d8840d1662a88 (diff) | |
| parent | ebef9f5a56d7df91e010a177a80cfc8dbe394305 (diff) | |
| download | ffmpeg-dc81c0a0dc7b3f766e5a511a7fab47d61f8a9c03.tar.gz | |
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 <michaelni@gmx.at>
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -4655,7 +4655,7 @@ check_func ${malloc_prefix}memalign && enable memalign check_func ${malloc_prefix}posix_memalign && enable posix_memalign 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 |