It will be removed in the next commit.
Signed-off-by: James Almer <jamr...@gmail.com>
---
libavcodec/utils.c | 8 +++++---
1 file 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);
}
--
2.31.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
