diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-11 16:42:27 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-11 16:42:27 -0300 |
| commit | 4e754e94195b21b49f37471d29841cff2562e320 (patch) | |
| tree | bfb8d08f0cd41c27da432dfe84f5c6c7bf51de71 /libavutil | |
| parent | 28e012234a9bf9118a69a324de6392ce64fb65d2 (diff) | |
| parent | b46900914a1f25ce8dbf49d7c53766ff1f18b60f (diff) | |
| download | ffmpeg-streaming-4e754e94195b21b49f37471d29841cff2562e320.zip ffmpeg-streaming-4e754e94195b21b49f37471d29841cff2562e320.tar.gz | |
Merge commit 'b46900914a1f25ce8dbf49d7c53766ff1f18b60f'
* commit 'b46900914a1f25ce8dbf49d7c53766ff1f18b60f':
build: Merge mach/mach_time.h and mach_absolute_time() checks
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/timer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/timer.h b/libavutil/timer.h index f7ab455..0bb353c 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 |
