Skip to content

Commit

Permalink
fix over-allocation. confused b4_stride with mb_width.
Browse files Browse the repository at this point in the history
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@24758 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
  • Loading branch information
skal committed Aug 11, 2010
1 parent c6e5061 commit 4684b10
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions libavcodec/vp8.c
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ static int update_dimensions(VP8Context *s, int width, int height)

s->macroblocks_base = av_mallocz((s->mb_stride+s->mb_height*2+2)*sizeof(*s->macroblocks));
s->filter_strength = av_mallocz(s->mb_stride*sizeof(*s->filter_strength));
s->intra4x4_pred_mode_top = av_mallocz(s->b4_stride*4);
s->intra4x4_pred_mode_top = av_mallocz(s->mb_width*4);
s->top_nnz = av_mallocz(s->mb_width*sizeof(*s->top_nnz));
s->top_border = av_mallocz((s->mb_width+1)*sizeof(*s->top_border));
s->segmentation_map = av_mallocz(s->mb_stride*s->mb_height);
Expand Down Expand Up @@ -1543,7 +1543,7 @@ static int vp8_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
memset(s->top_border, 127, (s->mb_width+1)*sizeof(*s->top_border));
memset(s->ref_count, 0, sizeof(s->ref_count));
if (s->keyframe)
memset(s->intra4x4_pred_mode_top, DC_PRED, s->b4_stride*4);
memset(s->intra4x4_pred_mode_top, DC_PRED, s->mb_width*4);

for (mb_y = 0; mb_y < s->mb_height; mb_y++) {
VP56RangeCoder *c = &s->coeff_partition[mb_y & (s->num_coeff_partitions-1)];
Expand Down

0 comments on commit 4684b10

Please sign in to comment.