PR #24833 opened by Martin Storsjö (mstorsjo) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/24833 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/24833.patch
From 40a4f154709a5d62e465ab98de4789462daef620 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <[email protected]> Date: Tue, 29 Sep 2026 15:17:24 +0300 Subject: [PATCH 1/2] libfdk-aacenc: Fix memory leaks on error on init The close function isn't called automatically when the init function returns an error, we need to goto the error cleanup at the end of the function instead. --- libavcodec/libfdk-aacenc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c index 0a9ab7b5b7..072000923b 100644 --- a/libavcodec/libfdk-aacenc.c +++ b/libavcodec/libfdk-aacenc.c @@ -441,8 +441,10 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) } cpb_props = ff_encode_add_cpb_side_data(avctx); - if (!cpb_props) - return AVERROR(ENOMEM); + if (!cpb_props) { + ret = AVERROR(ENOMEM); + goto error; + } cpb_props->max_bitrate = cpb_props->min_bitrate = cpb_props->avg_bitrate = avctx->bit_rate; -- 2.52.0 From 3c3109cf3008d28dd0df499881ad1883e43f010a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <[email protected]> Date: Wed, 30 Sep 2026 10:38:13 +0300 Subject: [PATCH 2/2] libfdk-aacenc: Remove an unused variable Since c31a781412a3aa801cc0997ba001177f258f4d80, the private variable isn't needed any more. --- libavcodec/libfdk-aacenc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c index 072000923b..89cf08906f 100644 --- a/libavcodec/libfdk-aacenc.c +++ b/libavcodec/libfdk-aacenc.c @@ -55,7 +55,6 @@ typedef struct AACContext { int prog_ref; int metadata_mode; AACENC_MetaData metaDataSetup; - int delay; int frame_length; AudioFrameQueue afq; @@ -420,7 +419,6 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) } avctx->frame_size = info.frameLength; - s->delay = #if FDKENC_VER_AT_LEAST(4, 0) // 4.0.0 avctx->initial_padding = info.nDelay; #else -- 2.52.0 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
