Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

alacdec: simplify buffer allocation by using FF_ALLOC_OR_GOTO()

Browse source
This commit is contained in:
Justin Ruggles 2011-10-10 11:21:07 -04:00
parent b316af7a7c
commit 68f7e9cd8e
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
libavcodec/alac.c
View file

@ -548,22 +548,21 @@ static int allocate_buffers(ALACContext *alac)
{ {
int ch; int ch;
for (ch = 0; ch < alac->numchannels; ch++) { for (ch = 0; ch < alac->numchannels; ch++) {
alac->predicterror_buffer[ch] = int buf_size = alac->setinfo_max_samples_per_frame * sizeof(int32_t);
av_malloc(alac->setinfo_max_samples_per_frame * 4);
alac->outputsamples_buffer[ch] = FF_ALLOC_OR_GOTO(alac->avctx, alac->predicterror_buffer[ch],
av_malloc(alac->setinfo_max_samples_per_frame * 4); buf_size, buf_alloc_fail);
alac->extra_bits_buffer[ch] = av_malloc(alac->setinfo_max_samples_per_frame * 4); FF_ALLOC_OR_GOTO(alac->avctx, alac->outputsamples_buffer[ch],
buf_size, buf_alloc_fail);
if (!alac->predicterror_buffer[ch] || FF_ALLOC_OR_GOTO(alac->avctx, alac->extra_bits_buffer[ch],
!alac->outputsamples_buffer[ch] || buf_size, buf_alloc_fail);
!alac->extra_bits_buffer[ch]) {
alac_decode_close(alac->avctx);
return AVERROR(ENOMEM);
}
} }
return 0; return 0;
buf_alloc_fail:
alac_decode_close(alac->avctx);
return AVERROR(ENOMEM);
} }
static int alac_set_info(ALACContext *alac) static int alac_set_info(ALACContext *alac)