[FFmpeg-cvslog] Merge commit 'b46900914a1f25ce8dbf49d7c53766ff1f18b60f'
James Almer
git at videolan.org
Sat Nov 11 21:43:47 EET 2017
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Nov 11 16:42:27 2017 -0300| [4e754e94195b21b49f37471d29841cff2562e320] | committer: James Almer
Merge commit 'b46900914a1f25ce8dbf49d7c53766ff1f18b60f'
* commit 'b46900914a1f25ce8dbf49d7c53766ff1f18b60f':
build: Merge mach/mach_time.h and mach_absolute_time() checks
Merged-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4e754e94195b21b49f37471d29841cff2562e320
---
configure | 4 +---
libavutil/timer.h | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index 2eb00f113a..256be4d5dc 100755
--- a/configure
+++ b/configure
@@ -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
diff --git a/libavutil/timer.h b/libavutil/timer.h
index f7ab455df2..0bb353cfce 100644
--- a/libavutil/timer.h
+++ b/libavutil/timer.h
@@ -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
======================================================================
diff --cc configure
index 2eb00f113a,c5d4e262d6..256be4d5dc
--- a/configure
+++ b/configure
@@@ -1916,12 -1553,9 +1916,11 @@@ HEADERS_LIST=
dev_video_bktr_ioctl_bt848_h
dev_video_meteor_ioctl_meteor_h
direct_h
+ dirent_h
dxgidebug_h
dxva_h
+ ES2_gl_h
io_h
- mach_mach_time_h
machine_ioctl_bt848_h
machine_ioctl_meteor_h
malloc_h
@@@ -5705,8 -4561,9 +5704,7 @@@ check_func gethrtim
check_func getopt
check_func getrusage
check_func gettimeofday
-check_func gmtime_r
check_func isatty
- check_func mach_absolute_time
-check_func localtime_r
check_func mkstemp
check_func mmap
check_func mprotect
@@@ -5720,11 -4576,9 +5718,12 @@@ check_func syscon
check_func sysctl
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
check_func_headers windows.h GetProcessAffinityMask
check_func_headers windows.h GetProcessTimes
@@@ -5737,20 -4589,13 +5736,19 @@@ check_func_headers windows.h SetConsole
check_func_headers windows.h Sleep
check_func_headers windows.h VirtualAlloc
check_struct windows.h "CONDITION_VARIABLE" Ptr
+check_func_headers glob.h glob
+enabled xlib &&
+ check_func_headers "X11/Xlib.h X11/extensions/Xvlib.h" XvGetPortAttribute -lXv -lX11 -lXext
check_header direct.h
+check_header dirent.h
check_header dxgidebug.h
check_header dxva.h
-check_header dxva2api.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
check_header sys/param.h
check_header sys/resource.h
diff --cc libavutil/timer.h
index f7ab455df2,8468159d92..0bb353cfce
--- a/libavutil/timer.h
+++ b/libavutil/timer.h
@@@ -42,7 -30,9 +42,7 @@@
#include <stdint.h>
#include <inttypes.h>
- #if HAVE_MACH_MACH_TIME_H
-#include "config.h"
-
+ #if HAVE_MACH_ABSOLUTE_TIME
#include <mach/mach_time.h>
#endif
More information about the ffmpeg-cvslog
mailing list