Merge commit '7c371754fbc0dcc23bd00278b147f8095ccc5625'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Aug 2014 10:38:31 +0000 (12:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Aug 2014 10:38:36 +0000 (12:38 +0200)
commitedd0dc854d45229f48504dea3482759b0ca92d54
treea1378b4110f2e65b2ca486a97b81e557bd4182c0
parent6afd726b7b279cac09d8a8eb6d5529ac2425a996
parent7c371754fbc0dcc23bd00278b147f8095ccc5625
Merge commit '7c371754fbc0dcc23bd00278b147f8095ccc5625'

* commit '7c371754fbc0dcc23bd00278b147f8095ccc5625':
  atomic_win32: Drop unnecessary atomic.h #include

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