virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Merge commit 'b46900914a1f25ce8dbf49d7c53766ff1f18b60f'

Browse Source 
* commit 'b46900914a1f25ce8dbf49d7c53766ff1f18b60f':
  build: Merge mach/mach_time.h and mach_absolute_time() checks

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-11-11 16:42:27 -03:00
commit 4e754e9419
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -1921,7 +1921,6 @@ HEADERS_LIST="
dxva_h
ES2_gl_h
io_h
mach_mach_time_h
machine_ioctl_bt848_h
machine_ioctl_meteor_h
malloc_h
@ -5706,7 +5705,6 @@ check_func getopt
check_func getrusage
check_func gettimeofday
check_func isatty
check_func mach_absolute_time
check_func mkstemp
check_func mmap
check_func mprotect
@ -5723,6 +5721,7 @@ check_func usleep
check_func_headers conio.h kbhit
check_func_headers io.h setmode
check_func_headers lzo/lzo1x.h lzo1x_999_compress
check_func_headers mach/mach_time.h mach_absolute_time
check_func_headers stdlib.h getenv
check_func_headers sys/stat.h lstat
@ -5748,7 +5747,6 @@ check_header dxva.h
check_header dxva2api.h -D_WIN32_WINNT=0x0600
check_header io.h
check_header libcrystalhd/libcrystalhd_if.h
check_header mach/mach_time.h
check_header malloc.h
check_header net/udplite.h
check_header poll.h

2
libavutil/timer.h
View File

@ -42,7 +42,7 @@
#include <stdint.h>
#include <inttypes.h>
#if HAVE_MACH_MACH_TIME_H
#if HAVE_MACH_ABSOLUTE_TIME
#include <mach/mach_time.h>
#endif