diff options
| author | James Almer <jamrial@gmail.com> | 2021-05-23 11:18:18 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2021-05-27 10:28:32 -0300 |
| commit | e44cb7363fed11b638f1cfc798d942bcf1e4db50 (patch) | |
| tree | d0919d99508f130305a225b4719d98b6c65709d7 | |
| parent | 7a879cce3793a1314ce50cef4b75671f5e0c0219 (diff) | |
| download | ffmpeg-e44cb7363fed11b638f1cfc798d942bcf1e4db50.tar.gz | |
avcodec/utils: don't use ff_fast_mallocz() in av_fast_padded_malloc()
It will be removed in the next commit.
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/utils.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index c08f9a7da3..cc6796d8b6 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -29,7 +29,7 @@ #include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/intreadwrite.h" -#include "libavutil/mem_internal.h" +#include "libavutil/mem.h" #include "libavutil/pixdesc.h" #include "libavutil/imgutils.h" #include "libavutil/pixfmt.h" @@ -55,7 +55,8 @@ void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size) *size = 0; return; } - if (!ff_fast_malloc(p, size, min_size + AV_INPUT_BUFFER_PADDING_SIZE, 1)) + av_fast_mallocz(p, size, min_size + AV_INPUT_BUFFER_PADDING_SIZE); + if (*p) memset(*p + min_size, 0, AV_INPUT_BUFFER_PADDING_SIZE); } @@ -67,7 +68,8 @@ void av_fast_padded_mallocz(void *ptr, unsigned int *size, size_t min_size) *size = 0; return; } - if (!ff_fast_malloc(p, size, min_size + AV_INPUT_BUFFER_PADDING_SIZE, 1)) + av_fast_malloc(p, size, min_size + AV_INPUT_BUFFER_PADDING_SIZE); + if (*p) memset(*p, 0, min_size + AV_INPUT_BUFFER_PADDING_SIZE); } |