virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

Merge commit 'f9f6402e9c9ce3642df981b48507df3a2d956f65'

Browse Source 
* commit 'f9f6402e9c9ce3642df981b48507df3a2d956f65':
  configure: prettify atomics handling.

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-04-03 14:46:48 +02:00
commit 6ce1d87355
4 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure vendored
View File

@ -1264,6 +1264,12 @@ THREADS_LIST='
os2threads os2threads
' '
ATOMICS_LIST='
atomics_gcc
atomics_win32
atomics_suncc
'
ARCH_LIST=' ARCH_LIST='
aarch64 aarch64
alpha alpha
@ -1374,6 +1380,7 @@ HAVE_LIST="
$HAVE_LIST_CMDLINE $HAVE_LIST_CMDLINE
$HAVE_LIST_PUB $HAVE_LIST_PUB
$THREADS_LIST $THREADS_LIST
$ATOMICS_LIST
$MATH_FUNCS $MATH_FUNCS
access access
aligned_malloc aligned_malloc
@ -1384,6 +1391,7 @@ HAVE_LIST="
asm_mod_q asm_mod_q
asm_mod_y asm_mod_y
asm_types_h asm_types_h
atomics_native
attribute_may_alias attribute_may_alias
attribute_packed attribute_packed
cdio_paranoia_h cdio_paranoia_h
@ -3909,6 +3917,10 @@ if enabled pthreads; then
check_func pthread_cancel check_func pthread_cancel
fi fi
enabled sync_val_compare_and_swap && enable atomics_gcc
enabled machine_rw_barrier && enable atomics_suncc
enabled MemoryBarrier && enable atomics_win32
check_lib math.h sin -lm && LIBM="-lm" check_lib math.h sin -lm && LIBM="-lm"
disabled crystalhd || check_lib libcrystalhd/libcrystalhd_if.h DtsCrystalHDVersion -lcrystalhd || disable crystalhd disabled crystalhd || check_lib libcrystalhd/libcrystalhd_if.h DtsCrystalHDVersion -lcrystalhd || disable crystalhd
enabled vaapi && require vaapi va/va.h vaInitialize -lva enabled vaapi && require vaapi va/va.h vaInitialize -lva
@ -4248,8 +4260,9 @@ case $target_os in
;; ;;
esac esac
enabled_any $THREADS_LIST && enable threads
enable frame_thread_encoder enable frame_thread_encoder
enabled_any $THREADS_LIST && enable threads
enabled_any $ATOMICS_LIST && enable atomics_native
enabled asm || { arch=c; disable $ARCH_LIST $ARCH_EXT_LIST; } enabled asm || { arch=c; disable $ARCH_LIST $ARCH_EXT_LIST; }

6
libavutil/Makefile
View File

@ -114,9 +114,9 @@ OBJS += $(COMPAT_OBJS:%=../compat/%)
SKIPHEADERS = old_pix_fmts.h SKIPHEADERS = old_pix_fmts.h
SKIPHEADERS-$(HAVE_MACHINE_RW_BARRIER) += atomic_suncc.h SKIPHEADERS-$(HAVE_ATOMICS_SUNCC) += atomic_suncc.h
SKIPHEADERS-$(HAVE_MEMORYBARRIER) += atomic_win32.h SKIPHEADERS-$(HAVE_ATOMICS_WIN32) += atomic_win32.h
SKIPHEADERS-$(HAVE_SYNC_VAL_COMPARE_AND_SWAP) += atomic_gcc.h SKIPHEADERS-$(HAVE_ATOMICS_GCC) += atomic_gcc.h
TESTPROGS = adler32 \ TESTPROGS = adler32 \
aes \ aes \

2
libavutil/atomic.c
View File

@ -20,7 +20,7 @@
#include "atomic.h" #include "atomic.h"
#if !HAVE_MEMORYBARRIER && !HAVE_SYNC_VAL_COMPARE_AND_SWAP && !HAVE_MACHINE_RW_BARRIER #if !HAVE_ATOMICS_NATIVE
#if HAVE_PTHREADS #if HAVE_PTHREADS

6
libavutil/atomic.h
View File

@ -23,11 +23,11 @@
#include "config.h" #include "config.h"
#if HAVE_SYNC_VAL_COMPARE_AND_SWAP #if HAVE_ATOMICS_GCC
#include "atomic_gcc.h" #include "atomic_gcc.h"
#elif HAVE_MEMORYBARRIER #elif HAVE_ATOMICS_WIN32
#include "atomic_win32.h" #include "atomic_win32.h"
#elif HAVE_MACHINE_RW_BARRIER #elif HAVE_ATOMICS_SUNCC
#include "atomic_suncc.h" #include "atomic_suncc.h"
#else #else