avutil/buffer_internal: leave the buffer pool entries volatile
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Nov 2014 00:17:56 +0000 (01:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Dec 2014 12:50:46 +0000 (13:50 +0100)
Theres no reason to remove the volatile keyword in a release branch

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0e216ed40789e382eb6725d1cd0941927bfd1400)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/buffer_internal.h

index e653048..befeb68 100644 (file)
@@ -69,12 +69,12 @@ typedef struct BufferPoolEntry {
     void (*free)(void *opaque, uint8_t *data);
 
     AVBufferPool *pool;
-    struct BufferPoolEntry *next;
+    struct BufferPoolEntry * volatile next;
 } BufferPoolEntry;
 
 struct AVBufferPool {
     AVMutex mutex;
-    BufferPoolEntry *pool;
+    BufferPoolEntry * volatile pool;
 
     /*
      * This is used to track when the pool is to be freed.