diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 14:30:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 14:30:24 +0100 |
| commit | c2923100f5a1199c46d5bc351fb3371956d1b90c (patch) | |
| tree | cb41bb2dbab5fdd3795a3343e17f1ac231d62c0a /tests/fate/filter-audio.mak | |
| parent | fa4f57399774b7c09c5978652b2eaea77f8851e1 (diff) | |
| parent | c708b5403346255ea5adc776645616cc7c61f078 (diff) | |
| download | ffmpeg-c2923100f5a1199c46d5bc351fb3371956d1b90c.tar.gz | |
Merge commit 'c708b5403346255ea5adc776645616cc7c61f078'
* commit 'c708b5403346255ea5adc776645616cc7c61f078':
timer: use mach_absolute_time as high resolution clock on darwin
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/filter-audio.mak')
0 files changed, 0 insertions, 0 deletions