1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00

Merge commit '7c371754fbc0dcc23bd00278b147f8095ccc5625'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-15 12:38:31 +02:00
commit edd0dc854d

View File

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