- goto alloc_fail;
-
- FF_ALLOC_ARRAY_OR_GOTO(avctx, s->bap_buffer, total_coefs,
- sizeof(*s->bap_buffer), alloc_fail);
- FF_ALLOC_ARRAY_OR_GOTO(avctx, s->bap1_buffer, total_coefs,
- sizeof(*s->bap1_buffer), alloc_fail);
- FF_ALLOCZ_ARRAY_OR_GOTO(avctx, s->mdct_coef_buffer, total_coefs,
- sizeof(*s->mdct_coef_buffer), alloc_fail);
- FF_ALLOC_ARRAY_OR_GOTO(avctx, s->exp_buffer, total_coefs,
- sizeof(*s->exp_buffer), alloc_fail);
- FF_ALLOC_ARRAY_OR_GOTO(avctx, s->grouped_exp_buffer, channel_blocks, 128 *
- sizeof(*s->grouped_exp_buffer), alloc_fail);
- FF_ALLOC_ARRAY_OR_GOTO(avctx, s->psd_buffer, total_coefs,
- sizeof(*s->psd_buffer), alloc_fail);
- FF_ALLOC_ARRAY_OR_GOTO(avctx, s->band_psd_buffer, channel_blocks, 64 *
- sizeof(*s->band_psd_buffer), alloc_fail);
- FF_ALLOC_ARRAY_OR_GOTO(avctx, s->mask_buffer, channel_blocks, 64 *
- sizeof(*s->mask_buffer), alloc_fail);
- FF_ALLOC_ARRAY_OR_GOTO(avctx, s->qmant_buffer, total_coefs,
- sizeof(*s->qmant_buffer), alloc_fail);
+ return AVERROR(ENOMEM);
+
+ if (!FF_ALLOC_TYPED_ARRAY(s->bap_buffer, total_coefs) ||
+ !FF_ALLOC_TYPED_ARRAY(s->bap1_buffer, total_coefs) ||
+ !FF_ALLOCZ_TYPED_ARRAY(s->mdct_coef_buffer, total_coefs) ||
+ !FF_ALLOC_TYPED_ARRAY(s->exp_buffer, total_coefs) ||
+ !FF_ALLOC_TYPED_ARRAY(s->grouped_exp_buffer, channel_blocks * 128) ||
+ !FF_ALLOC_TYPED_ARRAY(s->psd_buffer, total_coefs) ||
+ !FF_ALLOC_TYPED_ARRAY(s->band_psd_buffer, channel_blocks * 64) ||
+ !FF_ALLOC_TYPED_ARRAY(s->mask_buffer, channel_blocks * 64) ||
+ !FF_ALLOC_TYPED_ARRAY(s->qmant_buffer, total_coefs))
+ return AVERROR(ENOMEM);
+