Commit 37923cd3 authored by Michael Niedermayer's avatar Michael Niedermayer

alignment fix

Originally committed as revision 2890 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 67086c85
...@@ -340,15 +340,15 @@ static int alloc_picture(MpegEncContext *s, Picture *pic, int shared){ ...@@ -340,15 +340,15 @@ static int alloc_picture(MpegEncContext *s, Picture *pic, int shared){
pic->mb_type= pic->mb_type_base + s->mb_stride+1; pic->mb_type= pic->mb_type_base + s->mb_stride+1;
if(s->out_format == FMT_H264){ if(s->out_format == FMT_H264){
for(i=0; i<2; i++){ for(i=0; i<2; i++){
CHECKED_ALLOCZ(pic->motion_val_base[i], 2 * (b4_array_size+1) * sizeof(int16_t)) CHECKED_ALLOCZ(pic->motion_val_base[i], 2 * (b4_array_size+2) * sizeof(int16_t))
pic->motion_val[i]= pic->motion_val_base[i]+1; pic->motion_val[i]= pic->motion_val_base[i]+2;
CHECKED_ALLOCZ(pic->ref_index[i] , b8_array_size * sizeof(uint8_t)) CHECKED_ALLOCZ(pic->ref_index[i] , b8_array_size * sizeof(uint8_t))
} }
pic->motion_subsample_log2= 2; pic->motion_subsample_log2= 2;
}else if(s->out_format == FMT_H263 || s->encoding || (s->avctx->debug&FF_DEBUG_MV) || (s->avctx->debug_mv)){ }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++){ for(i=0; i<2; i++){
CHECKED_ALLOCZ(pic->motion_val_base[i], 2 * (b8_array_size+1) * sizeof(int16_t)*2) //FIXME CHECKED_ALLOCZ(pic->motion_val_base[i], 2 * (b8_array_size+2) * sizeof(int16_t)*2) //FIXME
pic->motion_val[i]= pic->motion_val_base[i]+1; pic->motion_val[i]= pic->motion_val_base[i]+2;
} }
pic->motion_subsample_log2= 3; pic->motion_subsample_log2= 3;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment