From 3cb0bd06a8dc154449b0cdff1c57a10ee55f8b30 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sun, 16 Jul 2023 16:41:47 +0200 Subject: [PATCH] avcodec/msrleenc: Check frame allocations/references MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also allocate the AVFrame during init and use av_frame_replace() to replace it later. Reviewed-by: Tomas Härdin Signed-off-by: Andreas Rheinhardt --- libavcodec/msrleenc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/msrleenc.c b/libavcodec/msrleenc.c index d5931f42fe..11f7d2a319 100644 --- a/libavcodec/msrleenc.c +++ b/libavcodec/msrleenc.c @@ -37,7 +37,13 @@ typedef struct MSRLEContext { static av_cold int msrle_encode_init(AVCodecContext *avctx) { + MSRLEContext *s = avctx->priv_data; + avctx->bits_per_coded_sample = 8; + s->last_frame = av_frame_alloc(); + if (!s->last_frame) + return AVERROR(ENOMEM); + return 0; } @@ -265,13 +271,7 @@ static int msrle_encode_frame(AVCodecContext *avctx, AVPacket *pkt, s->curframe = 0; *got_packet = 1; - if (!s->last_frame) - s->last_frame = av_frame_alloc(); - else - av_frame_unref(s->last_frame); - - av_frame_ref(s->last_frame, pict); - return 0; + return av_frame_replace(s->last_frame, pict); } static int msrle_encode_close(AVCodecContext *avctx)