git.videolan.org
/
ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit '7c371754fbc0dcc23bd00278b147f8095ccc5625'
[ffmpeg.git]
/
libavutil
/
atomic_win32.h
diff --git
a/libavutil/atomic_win32.h
b/libavutil/atomic_win32.h
index
f4ee078
..
20b99df
100644
(file)
--- a/
libavutil/atomic_win32.h
+++ b/
libavutil/atomic_win32.h
@@
-23,8
+23,6
@@
#include <windows.h>
#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)
{
#define avpriv_atomic_int_get atomic_int_get_win32
static inline int atomic_int_get_win32(volatile int *ptr)
{