aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-04-25 01:43:26 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-05-23 14:56:35 +0200
commitcfff94b7f8ddbda08b64c50057d3dd5b78773eb4 (patch)
tree790da72b1d04b525d31a085571019eccd5854ea8
parentad26efbf5268daec2b8c00e06568a984d3fa1b3a (diff)
downloadffmpeg-cfff94b7f8ddbda08b64c50057d3dd5b78773eb4.tar.gz
avcodec/libwebpenc_animencoder: Allow user-supplied buffers
Here the packet size is known before allocating the packet, so that supporting user-supplied buffers is trivial. Reviewed-by: James Almer <jamrial@gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
-rw-r--r--libavcodec/libwebpenc_animencoder.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/libwebpenc_animencoder.c b/libavcodec/libwebpenc_animencoder.c
index 5f0c6ba194..742aefb467 100644
--- a/libavcodec/libwebpenc_animencoder.c
+++ b/libavcodec/libwebpenc_animencoder.c
@@ -25,6 +25,7 @@
*/
#include "config.h"
+#include "encode.h"
#include "libwebpenc_common.h"
#include <webp/mux.h>
@@ -67,7 +68,7 @@ static int libwebp_anim_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
WebPData assembled_data = { 0 };
ret = WebPAnimEncoderAssemble(s->enc, &assembled_data);
if (ret) {
- ret = ff_alloc_packet2(avctx, pkt, assembled_data.size, assembled_data.size);
+ ret = ff_get_encode_buffer(avctx, pkt, assembled_data.size, 0);
if (ret < 0)
return ret;
memcpy(pkt->data, assembled_data.bytes, assembled_data.size);
@@ -136,11 +137,11 @@ const AVCodec ff_libwebp_anim_encoder = {
.long_name = NULL_IF_CONFIG_SMALL("libwebp WebP image"),
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_WEBP,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY,
.priv_data_size = sizeof(LibWebPAnimContext),
.init = libwebp_anim_encode_init,
.encode2 = libwebp_anim_encode_frame,
.close = libwebp_anim_encode_close,
- .capabilities = AV_CODEC_CAP_DELAY,
.pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_RGB32,
AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUVA420P,