From 60215c334f10ed1cedbb2b99d44323b16f1e9f44 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Date: Thu, 17 Apr 2025 13:31:33 +0200 Subject: [PATCH 13/14] avcodec/magicyuvenc: Avoid excessive logmessages AVERROR(ENOMEM) is enough. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/magicyuvenc.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libavcodec/magicyuvenc.c b/libavcodec/magicyuvenc.c index e66d5c11cb..94e8d31122 100644 --- a/libavcodec/magicyuvenc.c +++ b/libavcodec/magicyuvenc.c @@ -233,10 +233,8 @@ static av_cold int magy_encode_init(AVCodecContext *avctx) sl->slice = av_malloc(avctx->width * (s->slice_height + 2) + AV_INPUT_BUFFER_PADDING_SIZE); - if (!sl->slice) { - av_log(avctx, AV_LOG_ERROR, "Cannot allocate temporary buffer.\n"); + if (!sl->slice) return AVERROR(ENOMEM); - } } } @@ -250,11 +248,8 @@ static av_cold int magy_encode_init(AVCodecContext *avctx) avctx->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); - - if (!avctx->extradata) { - av_log(avctx, AV_LOG_ERROR, "Could not allocate extradata.\n"); + if (!avctx->extradata) return AVERROR(ENOMEM); - } bytestream2_init_writer(&pb, avctx->extradata, MAGICYUV_EXTRADATA_SIZE); bytestream2_put_le32u(&pb, MKTAG('M', 'A', 'G', 'Y')); -- 2.45.2