ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sun Jan 11 13:41:14 2015 +0100| [4207c5a4ce0a5d69ebb6d052867f9b2ba5df7457] | committer: Michael Niedermayer
avcodec/pgssubdec: Use av_malloc*_array() Signed-off-by: Michael Niedermayer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4207c5a4ce0a5d69ebb6d052867f9b2ba5df7457 --- libavcodec/pgssubdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c index 36f1f82..2bee315 100644 --- a/libavcodec/pgssubdec.c +++ b/libavcodec/pgssubdec.c @@ -166,7 +166,7 @@ static int decode_rle(AVCodecContext *avctx, AVSubtitleRect *rect, rle_bitmap_end = buf + buf_size; - rect->pict.data[0] = av_malloc(rect->w * rect->h); + rect->pict.data[0] = av_malloc_array(rect->w, rect->h); if (!rect->pict.data[0]) return AVERROR(ENOMEM); @@ -509,7 +509,7 @@ static int display_end_segment(AVCodecContext *avctx, void *data, // Blank if last object_count was 0. if (!ctx->presentation.object_count) return 1; - sub->rects = av_mallocz(sizeof(*sub->rects) * ctx->presentation.object_count); + sub->rects = av_mallocz_array(ctx->presentation.object_count, sizeof(*sub->rects)); if (!sub->rects) { return AVERROR(ENOMEM); } _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
