From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 24 Feb 2015 23:32:57 +0000 (+0100)
Subject: Merge commit '8a273a746061a112e5e35066a8fd8e146d821a62'
X-Git-Tag: n2.7-dev~218
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/6e9bbaca6c6739e6524809d3e786ce1e10ad518b?hp=79052cd4ce4a8857cd1088cc69ba59506dfb1b81

Merge commit '8a273a746061a112e5e35066a8fd8e146d821a62'

* commit '8a273a746061a112e5e35066a8fd8e146d821a62':
  avio: Add an internal utility function for freeing dynamic buffers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h
index 5864048..f728535 100644
--- a/libavformat/avio_internal.h
+++ b/libavformat/avio_internal.h
@@ -150,4 +150,11 @@ int ffio_open_null_buf(AVIOContext **s);
  */
 int ffio_close_null_buf(AVIOContext *s);
 
+/**
+ * Free a dynamic buffer.
+ *
+ * @param s a pointer to an IO context opened by avio_open_dyn_buf()
+ */
+void ffio_free_dyn_buf(AVIOContext **s);
+
 #endif /* AVFORMAT_AVIO_INTERNAL_H */
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 3d77a7f..377d966 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -1117,6 +1117,16 @@ int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer)
     return size - padding;
 }
 
+void ffio_free_dyn_buf(AVIOContext **s)
+{
+    uint8_t *tmp;
+    if (!*s)
+        return;
+    avio_close_dyn_buf(*s, &tmp);
+    av_free(tmp);
+    *s = NULL;
+}
+
 static int null_buf_write(void *opaque, uint8_t *buf, int buf_size)
 {
     DynBuffer *d = opaque;