Mercurial > libavcodec.hg

comparison mpeg4video.c @ 11531:31033caa5344 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change ref_index structure so it matches how its organized in h264. Also revert the related error concealment hotfix.
author michael
date Tue, 23 Mar 2010 02:17:04 +0000
parents 82d006235248
children
comparison
equal deleted inserted replaced
11530:86e4be64519e 11531:31033caa5344
135 } 135 }
136 return MB_TYPE_DIRECT2 | MB_TYPE_8x8 | MB_TYPE_L0L1; 136 return MB_TYPE_DIRECT2 | MB_TYPE_8x8 | MB_TYPE_L0L1;
137 } else if(IS_INTERLACED(colocated_mb_type)){ 137 } else if(IS_INTERLACED(colocated_mb_type)){
138 s->mv_type = MV_TYPE_FIELD; 138 s->mv_type = MV_TYPE_FIELD;
139 for(i=0; i<2; i++){ 139 for(i=0; i<2; i++){
140 int field_select= s->next_picture.ref_index[0][s->block_index[2*i]]; 140 int field_select= s->next_picture.ref_index[0][4*mb_index + 2*i];
141 s->field_select[0][i]= field_select; 141 s->field_select[0][i]= field_select;
142 s->field_select[1][i]= i; 142 s->field_select[1][i]= i;
143 if(s->top_field_first){ 143 if(s->top_field_first){
144 time_pp= s->pp_field_time - field_select + i; 144 time_pp= s->pp_field_time - field_select + i;
145 time_pb= s->pb_field_time - field_select + i; 145 time_pb= s->pb_field_time - field_select + i;