diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 15:47:06 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 15:48:27 +0100 |
commit | e92ba51fd78dda1be8b9ab278c869eed6429514d (patch) | |
tree | 292f1264cd0bf60ee083e0cd9b0c2e169ce6e50c /configure | |
parent | 23eed00925c1dfacfe88d635ff5077d691f503f8 (diff) | |
parent | 65f1d45dcc71186ede72fff950996099d23359bd (diff) | |
download | ffmpeg-e92ba51fd78dda1be8b9ab278c869eed6429514d.tar.gz |
Merge commit '65f1d45dcc71186ede72fff950996099d23359bd'
* commit '65f1d45dcc71186ede72fff950996099d23359bd':
lavu: add support for atomic operations.
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -1437,10 +1437,12 @@ HAVE_LIST=" lzo1x_999_compress machine_ioctl_bt848_h machine_ioctl_meteor_h + machine_rw_barrier makeinfo malloc_h MapViewOfFile memalign + MemoryBarrier mkstemp mm_empty mmap @@ -1480,6 +1482,7 @@ HAVE_LIST=" struct_v4l2_frmivalenum_discrete symver_asm_label symver_gnu_asm + sync_synchronize sysconf sysctl sys_mman_h @@ -3792,6 +3795,9 @@ check_func_headers malloc.h _aligned_malloc && enable aligned_malloc check_func setrlimit check_func strerror_r check_func sched_getaffinity +check_builtin sync_synchronize "" "__sync_synchronize()" +check_builtin machine_rw_barrier mbarrier.h "__machine_rw_barrier()" +check_builtin MemoryBarrier windows.h "MemoryBarrier()" check_func sysconf check_func sysctl check_func usleep |