diff options
Diffstat (limited to 'libavutil')
-rw-r--r-- | libavutil/buffer.c | 26 | ||||
-rw-r--r-- | libavutil/buffer.h | 16 | ||||
-rw-r--r-- | libavutil/version.h | 2 |
3 files changed, 43 insertions, 1 deletions
diff --git a/libavutil/buffer.c b/libavutil/buffer.c index 08e6079139..d67b4bbdaf 100644 --- a/libavutil/buffer.c +++ b/libavutil/buffer.c @@ -216,6 +216,32 @@ int av_buffer_realloc(AVBufferRef **pbuf, int size) return 0; } +int av_buffer_replace(AVBufferRef **pdst, AVBufferRef *src) +{ + AVBufferRef *dst = *pdst; + AVBufferRef *tmp; + + if (!src) { + av_buffer_unref(pdst); + return 0; + } + + if (dst && dst->buffer == src->buffer) { + /* make sure the data pointers match */ + dst->data = src->data; + dst->size = src->size; + return 0; + } + + tmp = av_buffer_ref(src); + if (!tmp) + return AVERROR(ENOMEM); + + av_buffer_unref(pdst); + *pdst = tmp; + return 0; +} + AVBufferPool *av_buffer_pool_init2(int size, void *opaque, AVBufferRef* (*alloc)(void *opaque, int size), void (*pool_free)(void *opaque)) diff --git a/libavutil/buffer.h b/libavutil/buffer.h index c0f3f6cc9a..fd4e381efa 100644 --- a/libavutil/buffer.h +++ b/libavutil/buffer.h @@ -198,6 +198,22 @@ int av_buffer_make_writable(AVBufferRef **buf); int av_buffer_realloc(AVBufferRef **buf, int size); /** + * Ensure dst refers to the same data as src. + * + * When *dst is already equivalent to src, do nothing. Otherwise unreference dst + * and replace it with a new reference to src. + * + * @param dst Pointer to either a valid buffer reference or NULL. On success, + * this will point to a buffer reference equivalent to src. On + * failure, dst will be left untouched. + * @param src A buffer reference to replace dst with. May be NULL, then this + * function is equivalent to av_buffer_unref(dst). + * @return 0 on success + * AVERROR(ENOMEM) on memory allocation failure. + */ +int av_buffer_replace(AVBufferRef **dst, AVBufferRef *src); + +/** * @} */ diff --git a/libavutil/version.h b/libavutil/version.h index 7028bd2c88..1aca823650 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 56 -#define LIBAVUTIL_VERSION_MINOR 59 +#define LIBAVUTIL_VERSION_MINOR 60 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |