[FFmpeg-cvslog] Merge commit 'eb34d40354e2474517c9b9bd787e0dadc89c2a81'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Wed Mar 22 16:42:53 2017 +0100| [f015711ed1244fe8c09fd470262b57dfce6a2dbf] | committer: Clément Bœsch

Merge commit 'eb34d40354e2474517c9b9bd787e0dadc89c2a81'

* commit 'eb34d40354e2474517c9b9bd787e0dadc89c2a81':
  Add a compat dummy stdatomic.h used when threading is disabled
  Add a compat stdatomic.h implementation based on pthreads
  Add a compat stdatomic.h implementation based on suncc atomics
  Add a compat stdatomic.h implementation based on windows atomics
  Add a compat stdatomic.h implementation based on GCC atomics

This merge is a noop, see:
  41e891e89e Add a compat dummy stdatomic.h used when threading is disabled
  74b5f10862 Add a compat stdatomic.h implementation based on pthreads
  70faadc826 Add a compat stdatomic.h implementation based on suncc atomics
  c91e72ed52 Add a compat stdatomic.h implementation based on windows atomics
  3359eede8f Add a compat stdatomic.h implementation based on GCC atomics

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f015711ed1244fe8c09fd470262b57dfce6a2dbf
---