diff --git a/libavutil/buffer.c b/libavutil/buffer.c
index 3475e57b4a..5c753abce5 100644
--- a/libavutil/buffer.c
+++ b/libavutil/buffer.c
@@ -242,7 +242,7 @@ static BufferPoolEntry *get_pool(AVBufferPool *pool)
     BufferPoolEntry *cur = *(void * volatile *)&pool->pool, *last = NULL;
 
     while (cur != last) {
-        FFSWAP(BufferPoolEntry*, cur, last);
+        last = cur;
         cur = avpriv_atomic_ptr_cas((void * volatile *)&pool->pool, last, NULL);
         if (!cur)
             return NULL;