diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 13:05:19 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 13:06:26 +0400 |
commit | c74c3fb1420b847056d88b040a451c3c56286357 (patch) | |
tree | e73a6d8c9bf60323eb3ff38072b1cb9bfff24b96 /libavutil/mem.c | |
parent | ede42109e73a0f836bca1a241369a5108003b91a (diff) | |
parent | 3feb3d6ce4be0a09a9f8f13d613bed25b523b6e7 (diff) |
Merge commit '3feb3d6ce4be0a09a9f8f13d613bed25b523b6e7'
* commit '3feb3d6ce4be0a09a9f8f13d613bed25b523b6e7':
mem: Introduce av_reallocp
Conflicts:
doc/APIchanges
libavutil/mem.c
libavutil/mem.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/mem.c')
-rw-r--r-- | libavutil/mem.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/libavutil/mem.c b/libavutil/mem.c index 53eeb19f4c..3da8c29889 100644 --- a/libavutil/mem.c +++ b/libavutil/mem.c @@ -180,6 +180,22 @@ void *av_realloc_f(void *ptr, size_t nelem, size_t elsize) return r; } +int av_reallocp(void *ptr, size_t size) +{ + void **ptrptr = ptr; + void *ret; + + ret = av_realloc(*ptrptr, size); + + if (!ret) { + av_freep(ptr); + return AVERROR(ENOMEM); + } + + *ptrptr = ret; + return 0; +} + void *av_realloc_array(void *ptr, size_t nmemb, size_t size) { if (!size || nmemb >= INT_MAX / size) |