diff options
author | Anton Khirnov <anton@khirnov.net> | 2017-01-13 11:53:51 +0100 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2017-02-11 11:37:44 +0100 |
commit | 99684f3ae752fc8bfb44a2dd1482f8d7a3d8536d (patch) | |
tree | fe2ddc08dc5fb6bc915197d44319e845ef80452d /libavformat | |
parent | 435cd7bc99671bf561193421a50ac6e9d63c4266 (diff) |
avio: add a destructor for AVIOContext
Before this commit, AVIOContext is to be freed with a plain av_free(),
which prevents us from adding any deeper structure to it.
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/avio.h | 8 | ||||
-rw-r--r-- | libavformat/aviobuf.c | 17 | ||||
-rw-r--r-- | libavformat/version.h | 4 |
3 files changed, 24 insertions, 5 deletions
diff --git a/libavformat/avio.h b/libavformat/avio.h index 7bf7985c5e..e65135ed99 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -219,6 +219,14 @@ AVIOContext *avio_alloc_context( int (*write_packet)(void *opaque, uint8_t *buf, int buf_size), int64_t (*seek)(void *opaque, int64_t offset, int whence)); +/** + * Free the supplied IO context and everything associated with it. + * + * @param s Double pointer to the IO context. This function will write NULL + * into s. + */ +void avio_context_free(AVIOContext **s); + void avio_w8(AVIOContext *s, int b); void avio_write(AVIOContext *s, const unsigned char *buf, int size); void avio_wl64(AVIOContext *s, uint64_t val); diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 6d83a9661b..31476d3f6d 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -165,6 +165,11 @@ AVIOContext *avio_alloc_context( return s; } +void avio_context_free(AVIOContext **ps) +{ + av_freep(ps); +} + static void flush_buffer(AVIOContext *s) { if (s->buf_ptr > s->buffer) { @@ -1007,7 +1012,9 @@ int avio_close(AVIOContext *s) av_freep(&internal->protocols); av_freep(&s->opaque); av_freep(&s->buffer); - av_free(s); + + avio_context_free(&s); + return ffurl_close(h); } @@ -1186,7 +1193,9 @@ int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer) *pbuffer = d->buffer; size = d->size; av_free(d); - av_free(s); + + avio_context_free(&s); + return size - padding; } @@ -1229,6 +1238,8 @@ int ffio_close_null_buf(AVIOContext *s) size = d->size; av_free(d); - av_free(s); + + avio_context_free(&s); + return size; } diff --git a/libavformat/version.h b/libavformat/version.h index 65d5754630..92f3407909 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,8 +30,8 @@ #include "libavutil/version.h" #define LIBAVFORMAT_VERSION_MAJOR 57 -#define LIBAVFORMAT_VERSION_MINOR 10 -#define LIBAVFORMAT_VERSION_MICRO 3 +#define LIBAVFORMAT_VERSION_MINOR 11 +#define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |