diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-02 11:58:27 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-02 11:58:27 +0100 |
| commit | c1b712e078b29c2acbcc0d558543e141152355b2 (patch) | |
| tree | 957e3c64d1dfb8848cc0791fe78ee6b6c9613220 /compat | |
| parent | 859c4ae402ac297fa1ba547a267ba8337e26d123 (diff) | |
| parent | 407ac22322e5ce67996ec54ef619cafa4c9ceb78 (diff) | |
| download | ffmpeg-streaming-c1b712e078b29c2acbcc0d558543e141152355b2.zip ffmpeg-streaming-c1b712e078b29c2acbcc0d558543e141152355b2.tar.gz | |
Merge commit '407ac22322e5ce67996ec54ef619cafa4c9ceb78'
* commit '407ac22322e5ce67996ec54ef619cafa4c9ceb78':
w32pthreads: Map MemoryBarrier to __sync_synchronize on mingw
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/w32pthreads.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compat/w32pthreads.h b/compat/w32pthreads.h index 3a2f68f..c327962 100644 --- a/compat/w32pthreads.h +++ b/compat/w32pthreads.h @@ -39,9 +39,9 @@ #include <windows.h> #include <process.h> -/* MinGW requires the intrinsics header for the pthread_once fallback code */ #if _WIN32_WINNT < 0x0600 && defined(__MINGW32__) -#include <intrin.h> +#undef MemoryBarrier +#define MemoryBarrier __sync_synchronize #endif #include "libavutil/attributes.h" |
