@@ -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);
Signed-off-by: James Almer <jamrial@gmail.com> --- doc/examples/transcode_aac.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)