libavcodec/h264: replace assert() by av_assert0()

[ffmpeg] / libavcodec / g722enc.c

diff --git a/libavcodec/g722enc.c b/libavcodec/g722enc.c
index dac7c8776846230f035e49755d561e155a863f03..17dde9ec809837f0d0cd290885fef23dd897257d 100644 (file)
--- a/libavcodec/g722enc.c
+++ b/libavcodec/g722enc.c
@@ -75,9 +75,9 @@ static av_cold int g722_encode_init(AVCodecContext * avctx)
         int max_paths = frontier * FREEZE_INTERVAL;
         int i;
         for (i = 0; i < 2; i++) {
-            c->paths[i] = av_mallocz(max_paths * sizeof(**c->paths));
-            c->node_buf[i] = av_mallocz(2 * frontier * sizeof(**c->node_buf));
-            c->nodep_buf[i] = av_mallocz(2 * frontier * sizeof(**c->nodep_buf));
+            c->paths[i] = av_mallocz_array(max_paths, sizeof(**c->paths));
+            c->node_buf[i] = av_mallocz_array(frontier, 2 * sizeof(**c->node_buf));
+            c->nodep_buf[i] = av_mallocz_array(frontier, 2 * sizeof(**c->nodep_buf));
             if (!c->paths[i] || !c->node_buf[i] || !c->nodep_buf[i]) {
                 ret = AVERROR(ENOMEM);
                 goto error;