From: Andreas Rheinhardt Date: Mon, 26 Apr 2021 18:47:03 +0000 (+0200) Subject: avcodec/encode: Zero padding in ff_get_encode_buffer() X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=ad184c8e363018044715cbe9ebc0b576e54a6438;p=ffmpeg avcodec/encode: Zero padding in ff_get_encode_buffer() The documentation of the get_encode_buffer() callback does not require to zero the padding; therefore we do it in ff_get_encode_buffer(). This also constitutes an implicit check for whether the buffer is actually allocated with padding. The memset in avcodec_default_get_encode_buffer() is now redundant and has been removed. Reviewed-by: James Almer Signed-off-by: Andreas Rheinhardt --- diff --git a/libavcodec/encode.c b/libavcodec/encode.c index 9a4140f91ac..75129c8646f 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -74,7 +74,6 @@ int avcodec_default_get_encode_buffer(AVCodecContext *avctx, AVPacket *avpkt, in return ret; } avpkt->data = avpkt->buf->data; - memset(avpkt->data + avpkt->size, 0, AV_INPUT_BUFFER_PADDING_SIZE); return 0; } @@ -98,6 +97,7 @@ int ff_get_encode_buffer(AVCodecContext *avctx, AVPacket *avpkt, int64_t size, i ret = AVERROR(EINVAL); goto fail; } + memset(avpkt->data + avpkt->size, 0, AV_INPUT_BUFFER_PADDING_SIZE); ret = 0; fail: