Imported Debian version 2.5.0~trusty1.1

[deb_ffmpeg.git] / ffmpeg / libavutil / buffer_internal.h

diff --git a/ffmpeg/libavutil/buffer_internal.h b/ffmpeg/libavutil/buffer_internal.h
index c29190839e9835e2110851599a8b55566ee4af89..e6530485d350643e01939edb9ad539472cc596a4 100644 (file)
--- a/ffmpeg/libavutil/buffer_internal.h
+++ b/ffmpeg/libavutil/buffer_internal.h
@@ -22,6 +22,7 @@
 #include <stdint.h>
 
 #include "buffer.h"
+#include "thread.h"
 
 /**
  * The buffer is always treated as read-only.
@@ -68,11 +69,12 @@ typedef struct BufferPoolEntry {
     void (*free)(void *opaque, uint8_t *data);
 
     AVBufferPool *pool;
-    struct BufferPoolEntry * volatile next;
+    struct BufferPoolEntry *next;
 } BufferPoolEntry;
 
 struct AVBufferPool {
-    BufferPoolEntry * volatile pool;
+    AVMutex mutex;
+    BufferPoolEntry *pool;
 
     /*
      * This is used to track when the pool is to be freed.