diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-29 12:06:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-29 12:26:22 +0100 |
| commit | c299b6fd080743afa7d46f217eced54935d95bff (patch) | |
| tree | f913de47c97f0b7216f1e10669b0f71d1b28c22e /libavutil | |
| parent | 32eadfe453c32788ea57968e6e80f673f434739d (diff) | |
| download | ffmpeg-c299b6fd080743afa7d46f217eced54935d95bff.tar.gz | |
avutil/buffer: Move USE_ATOMICS to thread.h to avoid it becoming out of sync with it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/buffer.c | 2 | ||||
| -rw-r--r-- | libavutil/thread.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libavutil/buffer.c b/libavutil/buffer.c index 0f9f1a2992..b114afcbb1 100644 --- a/libavutil/buffer.c +++ b/libavutil/buffer.c @@ -25,8 +25,6 @@ #include "mem.h" #include "thread.h" -#define USE_ATOMICS !(HAVE_PTHREADS || HAVE_W32THREADS) - AVBufferRef *av_buffer_create(uint8_t *data, int size, void (*free)(void *opaque, uint8_t *data), void *opaque, int flags) diff --git a/libavutil/thread.h b/libavutil/thread.h index 973366182e..297b5b9a52 100644 --- a/libavutil/thread.h +++ b/libavutil/thread.h @@ -26,6 +26,8 @@ #if HAVE_PTHREADS || HAVE_W32THREADS || HAVE_OS2THREADS +#define USE_ATOMICS 0 + #if HAVE_PTHREADS #include <pthread.h> #elif HAVE_OS2THREADS @@ -43,6 +45,8 @@ #else +#define USE_ATOMICS 1 + #define AVMutex char #define ff_mutex_init(mutex, attr) (0) |