Mercurial > libavcodec.hg
diff motion_est.c @ 11531:31033caa5344 libavcodec
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 | 421c9441c11e |
| children | a734f92c94b4 |
line wrap: on
line diff
--- a/motion_est.c Mon Mar 22 21:12:31 2010 +0000 +++ b/motion_est.c Tue Mar 23 02:17:04 2010 +0000 @@ -850,8 +850,8 @@ } if(USES_LIST(mb_type, 0)){ - int field_select0= p->ref_index[0][xy ]; - int field_select1= p->ref_index[0][xy2]; + int field_select0= p->ref_index[0][4*mb_xy ]; + int field_select1= p->ref_index[0][4*mb_xy+2]; assert(field_select0==0 ||field_select0==1); assert(field_select1==0 ||field_select1==1); init_interlaced_ref(s, 0); @@ -878,8 +878,8 @@ d+= cmp(s, x>>shift, y>>shift, x&mask, y&mask, 0, 8, field_select1, 1, cmpf, chroma_cmpf, flags); } if(USES_LIST(mb_type, 1)){ - int field_select0= p->ref_index[1][xy ]; - int field_select1= p->ref_index[1][xy2]; + int field_select0= p->ref_index[1][4*mb_xy ]; + int field_select1= p->ref_index[1][4*mb_xy+2]; assert(field_select0==0 ||field_select0==1); assert(field_select1==0 ||field_select1==1); init_interlaced_ref(s, 2);