diff --git a/libavutil/buffer.c b/libavutil/buffer.c
index 0f9f1a2992..4e2a94bfe8 100644
--- a/libavutil/buffer.c
+++ b/libavutil/buffer.c
@@ -25,7 +25,8 @@
 #include "mem.h"
 #include "thread.h"
 
-#define USE_ATOMICS !(HAVE_PTHREADS || HAVE_W32THREADS)
+//#define USE_ATOMICS !(HAVE_PTHREADS || HAVE_W32THREADS)
+#define USE_ATOMICS 1 // can be changed to the above once it received more testing in master
 
 AVBufferRef *av_buffer_create(uint8_t *data, int size,
                               void (*free)(void *opaque, uint8_t *data),