Merge commit '65f1d45dcc71186ede72fff950996099d23359bd'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 14:47:06 +0000 (15:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 14:48:27 +0000 (15:48 +0100)
commite92ba51fd78dda1be8b9ab278c869eed6429514d
tree292f1264cd0bf60ee083e0cd9b0c2e169ce6e50c
parent23eed00925c1dfacfe88d635ff5077d691f503f8
parent65f1d45dcc71186ede72fff950996099d23359bd
Merge commit '65f1d45dcc71186ede72fff950996099d23359bd'

* commit '65f1d45dcc71186ede72fff950996099d23359bd':
  lavu: add support for atomic operations.

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavutil/Makefile
libavutil/atomic.c
libavutil/atomic.h
libavutil/atomic_gcc.h
libavutil/atomic_suncc.h
libavutil/atomic_win32.h
tests/fate/libavutil.mak