diff options
author | Anton Khirnov <anton@khirnov.net> | 2013-02-14 14:39:41 +0100 |
---|---|---|
committer | Reinhard Tartler <siretart@tauware.de> | 2013-02-23 14:46:54 +0100 |
commit | 77493bfd976253e87ac0d6934d64f51edc4d0d2c (patch) | |
tree | 1b85d1da6b88b654405fd60f138e9863745b18df | |
parent | bb3f1cad171b31537b64a9d19cabdbff50aca260 (diff) | |
download | ffmpeg-77493bfd976253e87ac0d6934d64f51edc4d0d2c.tar.gz |
cavs: initialize various context tables to 0
Avoids crashes with corrupted files.
CC:libav-stable@libav.org
(cherry picked from commit 4f3b058c84f570e261d743c7c22f865617fd28ac)
Conflicts:
libavcodec/cavs.c
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
-rw-r--r-- | libavcodec/cavs.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/cavs.c b/libavcodec/cavs.c index c110882377..f9b876ff65 100644 --- a/libavcodec/cavs.c +++ b/libavcodec/cavs.c @@ -702,17 +702,17 @@ void ff_cavs_init_pic(AVSContext *h) { */ void ff_cavs_init_top_lines(AVSContext *h) { /* alloc top line of predictors */ - h->top_qp = av_malloc( h->mb_width); - h->top_mv[0] = av_malloc((h->mb_width*2+1)*sizeof(cavs_vector)); - h->top_mv[1] = av_malloc((h->mb_width*2+1)*sizeof(cavs_vector)); - h->top_pred_Y = av_malloc( h->mb_width*2*sizeof(*h->top_pred_Y)); - h->top_border_y = av_malloc((h->mb_width+1)*16); - h->top_border_u = av_malloc( h->mb_width * 10); - h->top_border_v = av_malloc( h->mb_width * 10); + h->top_qp = av_mallocz( h->mb_width); + h->top_mv[0] = av_mallocz((h->mb_width*2+1)*sizeof(cavs_vector)); + h->top_mv[1] = av_mallocz((h->mb_width*2+1)*sizeof(cavs_vector)); + h->top_pred_Y = av_mallocz( h->mb_width*2*sizeof(*h->top_pred_Y)); + h->top_border_y = av_mallocz((h->mb_width+1)*16); + h->top_border_u = av_mallocz( h->mb_width * 10); + h->top_border_v = av_mallocz( h->mb_width * 10); /* alloc space for co-located MVs and types */ - h->col_mv = av_malloc( h->mb_width*h->mb_height*4*sizeof(cavs_vector)); - h->col_type_base = av_malloc(h->mb_width*h->mb_height); + h->col_mv = av_mallocz( h->mb_width*h->mb_height*4*sizeof(cavs_vector)); + h->col_type_base = av_mallocz(h->mb_width*h->mb_height); h->block = av_mallocz(64*sizeof(DCTELEM)); } |