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)
* commit '7c371754fbc0dcc23bd00278b147f8095ccc5625':
  atomic_win32: Drop unnecessary atomic.h #include

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

index f4ee078..20b99df 100644 (file)
@@ -23,8 +23,6 @@
 
 #include <windows.h>
 
-#include "atomic.h"
-
 #define avpriv_atomic_int_get atomic_int_get_win32
 static inline int atomic_int_get_win32(volatile int *ptr)
 {