diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-11 23:58:39 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-13 02:41:43 +0200 |
commit | d6ff68ad853cab83cb58905b33a3957d249a75dd (patch) | |
tree | 1fafcba3ded3d44f8589d6b26a86f09fe92cc528 /libavutil/mem_internal.h | |
parent | 03931ecf71710452fc9e89d4f18354f0b5e05395 (diff) | |
download | ffmpeg-d6ff68ad853cab83cb58905b33a3957d249a75dd.tar.gz |
Factor duplicated ff_fast_malloc() out into mem_internal.h
internal.h is difficult to use due to circular dependancies
mem.h is a public header ff_* is not public
Alternative solutions probably are possible too
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavutil/mem_internal.h')
-rw-r--r-- | libavutil/mem_internal.h | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/libavutil/mem_internal.h b/libavutil/mem_internal.h new file mode 100644 index 0000000000..54e14ac7b6 --- /dev/null +++ b/libavutil/mem_internal.h @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2002 Fabrice Bellard + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_MEM_INTERNAL_H +#define AVUTIL_MEM_INTERNAL_H + +static inline int ff_fast_malloc(void *ptr, unsigned int *size, size_t min_size, int zero_realloc) +{ + void *val; + + memcpy(&val, ptr, sizeof(val)); + if (min_size <= *size) { + av_assert0(val || !min_size); + return 0; + } + min_size = FFMAX(min_size + min_size / 16 + 32, min_size); + av_freep(ptr); + val = zero_realloc ? av_mallocz(min_size) : av_malloc(min_size); + memcpy(ptr, &val, sizeof(val)); + if (!val) + min_size = 0; + *size = min_size; + return 1; +} +#endif /* AVUTIL_MEM_INTERNAL_H */ |