[FFmpeg-cvslog] r24758 - trunk/libavcodec/vp8.c

skal subversion
Wed Aug 11 07:24:20 CEST 2010


Author: skal
Date: Wed Aug 11 07:24:19 2010
New Revision: 24758

Log:
fix over-allocation. confused b4_stride with mb_width.

Modified:
   trunk/libavcodec/vp8.c

Modified: trunk/libavcodec/vp8.c
==============================================================================
--- trunk/libavcodec/vp8.c	Tue Aug 10 19:27:22 2010	(r24757)
+++ trunk/libavcodec/vp8.c	Wed Aug 11 07:24:19 2010	(r24758)
@@ -242,7 +242,7 @@ static int update_dimensions(VP8Context 
 
     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);
@@ -1543,7 +1543,7 @@ static int vp8_decode_frame(AVCodecConte
     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)];



More information about the ffmpeg-cvslog mailing list