[FFmpeg-cvslog] avutil/buffer_internal: leave the buffer pool entries volatile

Michael Niedermayer git at videolan.org
Tue Dec 2 14:14:22 CET 2014


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 28 01:17:56 2014 +0100| [dad7beaceb652864cd16747db4109e7b9b2b4ea1] | committer: Michael Niedermayer

avutil/buffer_internal: leave the buffer pool entries volatile

Theres no reason to remove the volatile keyword in a release branch

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

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dad7beaceb652864cd16747db4109e7b9b2b4ea1
---

 libavutil/buffer_internal.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavutil/buffer_internal.h b/libavutil/buffer_internal.h
index e653048..befeb68 100644
--- a/libavutil/buffer_internal.h
+++ b/libavutil/buffer_internal.h
@@ -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.



More information about the ffmpeg-cvslog mailing list