Merge commit 'f9f6402e9c9ce3642df981b48507df3a2d956f65'

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

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc configure
index f5196e115cc1c24ec9adf2d6f62daf423c8490fd,7f77b007e6760748b4e34c935b0cc18260c0bff4..051b216be5d90e984b064c924ec8a1661783a1b9
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1261,9 -1120,14 +1261,15 @@@ CONFIG_LIST=
  THREADS_LIST='
      pthreads
      w32threads
 +    os2threads
  '
  
+ ATOMICS_LIST='
+     atomics_gcc
+     atomics_win32
+     atomics_suncc
+ '
+ 
  ARCH_LIST='
      aarch64
      alpha
@@@ -1374,8 -1232,8 +1380,9 @@@ HAVE_LIST=
      $HAVE_LIST_CMDLINE
      $HAVE_LIST_PUB
      $THREADS_LIST
+     $ATOMICS_LIST
      $MATH_FUNCS
 +    access
      aligned_malloc
      aligned_stack
      alsa_asoundlib_h
@@@ -1383,7 -1241,7 +1390,8 @@@
      arpa_inet_h
      asm_mod_q
      asm_mod_y
 +    asm_types_h
+     atomics_native
      attribute_may_alias
      attribute_packed
      cdio_paranoia_h
@@@ -3905,12 -3536,11 +3913,16 @@@ for thread in $THREADS_LIST; d
      fi
  done
  
 +if enabled pthreads; then
 +  check_func pthread_cancel
 +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"
 +disabled crystalhd || check_lib libcrystalhd/libcrystalhd_if.h DtsCrystalHDVersion -lcrystalhd || disable crystalhd
  enabled vaapi && require vaapi va/va.h vaInitialize -lva
  
  atan2f_args=2
@@@ -4248,8 -3802,8 +4260,9 @@@ case $target_os i
      ;;
  esac
  
- enabled_any $THREADS_LIST      && enable threads
 +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; }
  

diff --cc libavutil/Makefile
Simple merge

diff --cc libavutil/atomic.c
Simple merge

diff --cc libavutil/atomic.h
Simple merge