diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 12:38:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 12:38:36 +0200 |
| commit | edd0dc854d45229f48504dea3482759b0ca92d54 (patch) | |
| tree | a1378b4110f2e65b2ca486a97b81e557bd4182c0 | |
| parent | 6afd726b7b279cac09d8a8eb6d5529ac2425a996 (diff) | |
| parent | 7c371754fbc0dcc23bd00278b147f8095ccc5625 (diff) | |
| download | ffmpeg-edd0dc854d45229f48504dea3482759b0ca92d54.tar.gz | |
Merge commit '7c371754fbc0dcc23bd00278b147f8095ccc5625'
* commit '7c371754fbc0dcc23bd00278b147f8095ccc5625':
atomic_win32: Drop unnecessary atomic.h #include
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/atomic_win32.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavutil/atomic_win32.h b/libavutil/atomic_win32.h index f4ee07853f..20b99df378 100644 --- a/libavutil/atomic_win32.h +++ b/libavutil/atomic_win32.h @@ -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) { |