Merge commit '7c371754fbc0dcc23bd00278b147f8095ccc5625'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/74/merge
Michael Niedermayer 11 years ago
commit edd0dc854d
  1. 2
      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)
{

Loading…
Cancel
Save