[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 20 13:09:39 2013 +0100| [3f307d79d383e0ac505c9f8393d94fb36a092c05] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  atomics: cosmetics: Restructure ifdefs for greater clarity

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

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