[FFmpeg-cvslog] Merge commit '65f1d45dcc71186ede72fff950996099d23359bd'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar  8 15:47:06 2013 +0100| [e92ba51fd78dda1be8b9ab278c869eed6429514d] | committer: Michael Niedermayer

Merge commit '65f1d45dcc71186ede72fff950996099d23359bd'

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

Conflicts:
	configure

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

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