Merge commit '5127c00b971b674f72609369b39a9c0f7c36977d'

[ffmpeg] / libavutil / buffer.c

diff --git a/libavutil/buffer.c b/libavutil/buffer.c
index ca102fd57404f9732c6e09be8014b0de8e252a87..bb112c238e7eb60427763ba64d622f2afc6e1d10 100644 (file)
--- a/libavutil/buffer.c
+++ b/libavutil/buffer.c
@@ -159,8 +159,8 @@ int av_buffer_make_writable(AVBufferRef **pbuf)
         return AVERROR(ENOMEM);
 
     memcpy(newbuf->data, buf->data, buf->size);
-    av_buffer_unref(pbuf);
-    *pbuf = newbuf;
+
+    buffer_replace(pbuf, &newbuf);
 
     return 0;
 }
@@ -201,8 +201,7 @@ int av_buffer_realloc(AVBufferRef **pbuf, int size)
 
         memcpy(new->data, buf->data, FFMIN(size, buf->size));
 
-        av_buffer_unref(pbuf);
-        *pbuf = new;
+        buffer_replace(pbuf, &new);
         return 0;
     }