[FFmpeg-cvslog] atomic: prefer gcc builtins over win32 atomics, if available.

Hendrik Leppkes git at videolan.org
Tue Mar 12 10:49:25 CET 2013


ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sun Mar 10 23:03:42 2013 +0100| [b91459e565ec29f6dc6cf1bce2b64ee632e50412] | committer: Michael Niedermayer

atomic: prefer gcc builtins over win32 atomics, if available.

The mingw win32 atomics appear to be faulty, so they should not be used
if the gcc ones are available.

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b91459e565ec29f6dc6cf1bce2b64ee632e50412
---

 libavutil/atomic.h |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavutil/atomic.h b/libavutil/atomic.h
index 61512e0..1d2a345 100644
--- a/libavutil/atomic.h
+++ b/libavutil/atomic.h
@@ -23,10 +23,10 @@
 
 #include "config.h"
 
-#if HAVE_MEMORYBARRIER
-#include "atomic_win32.h"
-#elif HAVE_SYNC_VAL_COMPARE_AND_SWAP
+#if HAVE_SYNC_VAL_COMPARE_AND_SWAP
 #include "atomic_gcc.h"
+#elif HAVE_MEMORYBARRIER
+#include "atomic_win32.h"
 #elif HAVE_MACHINE_RW_BARRIER
 #include "atomic_suncc.h"
 #else



More information about the ffmpeg-cvslog mailing list