From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH 2/2] doc/examples/transcode_aac: use av_calloc to allocate the array of input samples buffer pointers
Date: Thu, 4 May 2023 20:48:52 -0300
Message-ID: <20230504234852.3789-2-jamrial@gmail.com> (raw)
In-Reply-To: <20230504234852.3789-1-jamrial@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
---
doc/examples/transcode_aac.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/doc/examples/transcode_aac.c b/doc/examples/transcode_aac.c
index 7f4ca382b1..eddb3b203d 100644
--- a/doc/examples/transcode_aac.c
+++ b/doc/examples/transcode_aac.c
@@ -450,8 +450,8 @@ static int init_converted_samples(uint8_t ***converted_input_samples,
* Each pointer will later point to the audio samples of the corresponding
* channels (although it may be NULL for interleaved formats).
*/
- if (!(*converted_input_samples = calloc(output_codec_context->ch_layout.nb_channels,
- sizeof(**converted_input_samples)))) {
+ if (!(*converted_input_samples = av_calloc(output_codec_context->ch_layout.nb_channels,
+ sizeof(**converted_input_samples)))) {
fprintf(stderr, "Could not allocate converted input sample pointers\n");
return AVERROR(ENOMEM);
}
@@ -465,8 +465,9 @@ static int init_converted_samples(uint8_t ***converted_input_samples,
fprintf(stderr,
"Could not allocate converted input samples (error '%s')\n",
av_err2str(error));
+
av_free((*converted_input_samples)[0]);
- free(*converted_input_samples);
+ av_freep(converted_input_samples);
return error;
}
return 0;
@@ -600,7 +601,7 @@ static int read_decode_convert_and_store(AVAudioFifo *fifo,
cleanup:
if (converted_input_samples) {
av_free(converted_input_samples[0]);
- free(converted_input_samples);
+ av_free(converted_input_samples);
}
av_frame_free(&input_frame);
--
2.40.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
prev parent reply other threads:[~2023-05-04 23:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-04 23:48 [FFmpeg-devel] [PATCH 1/2] doc/examples/transcode_aac: free the converted input samples buffer with av_free James Almer
2023-05-04 23:48 ` James Almer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230504234852.3789-2-jamrial@gmail.com \
--to=jamrial@gmail.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git