Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Dec 2013 12:09:39 +0000 (13:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Dec 2013 12:16:56 +0000 (13:16 +0100)
commit3f307d79d383e0ac505c9f8393d94fb36a092c05
treeb12e93c873578abb3b42f91293d6817adc425126
parent3b6e8634c3be16f6a34d9679d0d641e817f0944d
parente1b9de4fe15cda08cb18a2821a5729cf95e33d2a
Merge remote-tracking branch 'qatar/master'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/atomic.c
libavutil/atomic.h