[FFmpeg-cvslog] avutil/buffer: add #if USE_ATOMICS around atomics specific functions to ensure sync types arent mixed by mistake

Michael Niedermayer git at videolan.org
Sat Dec 6 20:56:46 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec  6 20:24:27 2014 +0100| [890d8f44fdfe08e5324b34019694f763c966fd28] | committer: Michael Niedermayer

avutil/buffer: add #if USE_ATOMICS around atomics specific functions to ensure sync types arent mixed by mistake

Fixes CID1257011

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

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

 libavutil/buffer.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavutil/buffer.c b/libavutil/buffer.c
index b114afc..c881d1a 100644
--- a/libavutil/buffer.c
+++ b/libavutil/buffer.c
@@ -250,6 +250,7 @@ void av_buffer_pool_uninit(AVBufferPool **ppool)
         buffer_pool_free(pool);
 }
 
+#if USE_ATOMICS
 /* remove the whole buffer list from the pool and return it */
 static BufferPoolEntry *get_pool(AVBufferPool *pool)
 {
@@ -285,6 +286,7 @@ static void add_to_pool(BufferPoolEntry *buf)
             end = end->next;
     }
 }
+#endif
 
 static void pool_release_buffer(void *opaque, uint8_t *data)
 {



More information about the ffmpeg-cvslog mailing list