Browse Source
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>tags/n2.5
Michael Niedermayer
11 years ago
2 changed files with 4 additions and 2 deletions
Unified View
Diff Options
-
+0 -2libavutil/buffer.c
-
+4 -0libavutil/thread.h
+ 0
- 2
libavutil/buffer.c
View File
| @@ -25,8 +25,6 @@ | |||||
| #include "mem.h" | #include "mem.h" | ||||
| #include "thread.h" | #include "thread.h" | ||||
| #define USE_ATOMICS !(HAVE_PTHREADS || HAVE_W32THREADS) | |||||
| AVBufferRef *av_buffer_create(uint8_t *data, int size, | AVBufferRef *av_buffer_create(uint8_t *data, int size, | ||||
| void (*free)(void *opaque, uint8_t *data), | void (*free)(void *opaque, uint8_t *data), | ||||
| void *opaque, int flags) | void *opaque, int flags) | ||||
+ 4
- 0
libavutil/thread.h
View File
| @@ -26,6 +26,8 @@ | |||||
| #if HAVE_PTHREADS || HAVE_W32THREADS || HAVE_OS2THREADS | #if HAVE_PTHREADS || HAVE_W32THREADS || HAVE_OS2THREADS | ||||
| #define USE_ATOMICS 0 | |||||
| #if HAVE_PTHREADS | #if HAVE_PTHREADS | ||||
| #include <pthread.h> | #include <pthread.h> | ||||
| #elif HAVE_OS2THREADS | #elif HAVE_OS2THREADS | ||||
| @@ -43,6 +45,8 @@ | |||||
| #else | #else | ||||
| #define USE_ATOMICS 1 | |||||
| #define AVMutex char | #define AVMutex char | ||||
| #define ff_mutex_init(mutex, attr) (0) | #define ff_mutex_init(mutex, attr) (0) | ||||