# HG changeset patch # User michael # Date 1073947159 0 # Node ID e39651dd13a9ce9a134e29a6a5f72a0b2ff6aad8 # Parent f0c21b9a328ec0daf309dc4f15cac57b0c30c84d type fixes, found by Wolfgang Hesseler diff -r f0c21b9a328e -r e39651dd13a9 mpegvideo.c --- a/mpegvideo.c Mon Jan 12 22:14:45 2004 +0000 +++ b/mpegvideo.c Mon Jan 12 22:39:19 2004 +0000 @@ -336,18 +336,18 @@ CHECKED_ALLOCZ(pic->mbskip_table , mb_array_size * sizeof(uint8_t)+2) //the +2 is for the slice end check CHECKED_ALLOCZ(pic->qscale_table , mb_array_size * sizeof(uint8_t)) - CHECKED_ALLOCZ(pic->mb_type_base , big_mb_num * sizeof(int)) + CHECKED_ALLOCZ(pic->mb_type_base , big_mb_num * sizeof(uint32_t)) pic->mb_type= pic->mb_type_base + s->mb_stride+1; if(s->out_format == FMT_H264){ for(i=0; i<2; i++){ - CHECKED_ALLOCZ(pic->motion_val_base[i], 2 * (b4_array_size+1) * sizeof(uint16_t)) + CHECKED_ALLOCZ(pic->motion_val_base[i], 2 * (b4_array_size+1) * sizeof(int16_t)) pic->motion_val[i]= pic->motion_val_base[i]+1; CHECKED_ALLOCZ(pic->ref_index[i] , b8_array_size * sizeof(uint8_t)) } pic->motion_subsample_log2= 2; }else if(s->out_format == FMT_H263 || s->encoding || (s->avctx->debug&FF_DEBUG_MV) || (s->avctx->debug_mv)){ for(i=0; i<2; i++){ - CHECKED_ALLOCZ(pic->motion_val_base[i], 2 * (b8_array_size+1) * sizeof(uint16_t)*2) //FIXME + CHECKED_ALLOCZ(pic->motion_val_base[i], 2 * (b8_array_size+1) * sizeof(int16_t)*2) //FIXME pic->motion_val[i]= pic->motion_val_base[i]+1; } pic->motion_subsample_log2= 3;