eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-05 21:55:37 +01:00
Code Issues Packages Projects Releases Wiki 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
parent 28e012234a b46900914a
commit 4e754e9419
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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