From: Limin Wang <lance.lmw...@gmail.com>
Signed-off-by: Limin Wang <lance.lmw...@gmail.com>
---
libavcodec/ac3enc_template.c | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/libavcodec/ac3enc_template.c b/libavcodec/ac3enc_template.c
index be65987..985b35e 100644
--- a/libavcodec/ac3enc_template.c
+++ b/libavcodec/ac3enc_template.c
@@ -41,19 +41,16 @@ int AC3_NAME(allocate_sample_buffers)(AC3EncodeContext *s)
{
int ch;
- FF_ALLOC_OR_GOTO(s->avctx, s->windowed_samples, AC3_WINDOW_SIZE *
- sizeof(*s->windowed_samples), alloc_fail);
- FF_ALLOC_ARRAY_OR_GOTO(s->avctx, s->planar_samples, s->channels,
sizeof(*s->planar_samples),
- alloc_fail);
+ if (!FF_ALLOC_TYPED_ARRAY(s->windowed_samples, AC3_WINDOW_SIZE) ||
+ !FF_ALLOC_TYPED_ARRAY(s->planar_samples, s->channels))
+ return AVERROR(ENOMEM);
+
for (ch = 0; ch < s->channels; ch++) {
- FF_ALLOCZ_OR_GOTO(s->avctx, s->planar_samples[ch],
- (AC3_FRAME_SIZE+AC3_BLOCK_SIZE) *
sizeof(**s->planar_samples),
- alloc_fail);
+ if (!(s->planar_samples[ch] = av_mallocz((AC3_FRAME_SIZE +
AC3_BLOCK_SIZE) *
+
sizeof(**s->planar_samples))))
+ return AVERROR(ENOMEM);
}
-
return 0;
-alloc_fail:
- return AVERROR(ENOMEM);
}
--
1.8.3.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-requ...@ffmpeg.org with subject "unsubscribe".
