diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-03-23 02:17:04 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-03-23 02:17:04 +0000 |
| commit | fc4a2d1e8cc06766677d33f4ba4777e256a709fc (patch) | |
| tree | 8f9367153e7bae75ded7c2ba79bc088167507feb /libavcodec/motion_est.c | |
| parent | 19de452a630f0906ef3ebda4f27ca7b2a4b59f07 (diff) | |
| download | ffmpeg-fc4a2d1e8cc06766677d33f4ba4777e256a709fc.tar.gz | |
Change ref_index structure so it matches how its organized in h264.
Also revert the related error concealment hotfix.
Originally committed as revision 22640 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/motion_est.c')
| -rw-r--r-- | libavcodec/motion_est.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index 1f5dbc71e8..75a664b440 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -850,8 +850,8 @@ static inline int check_input_motion(MpegEncContext * s, int mb_x, int mb_y, int } 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 @@ static inline int check_input_motion(MpegEncContext * s, int mb_x, int mb_y, int 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); |