Mercurial > libavcodec.hg

comparison h263.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 d0657e337f91
children 7dd2a45249a9
comparison
equal deleted inserted replaced
11530:86e4be64519e 11531:31033caa5344
69 motion_x = (motion_x>>1) | (motion_x&1); 69 motion_x = (motion_x>>1) | (motion_x&1);
70 for(i=0; i<2; i++){ 70 for(i=0; i<2; i++){
71 s->p_field_mv_table[i][0][mb_xy][0]= s->mv[0][i][0]; 71 s->p_field_mv_table[i][0][mb_xy][0]= s->mv[0][i][0];
72 s->p_field_mv_table[i][0][mb_xy][1]= s->mv[0][i][1]; 72 s->p_field_mv_table[i][0][mb_xy][1]= s->mv[0][i][1];
73 } 73 }
74 s->current_picture.ref_index[0][xy ]= 74 s->current_picture.ref_index[0][4*mb_xy ]=
75 s->current_picture.ref_index[0][xy + 1]= s->field_select[0][0]; 75 s->current_picture.ref_index[0][4*mb_xy + 1]= s->field_select[0][0];
76 s->current_picture.ref_index[0][xy + wrap ]= 76 s->current_picture.ref_index[0][4*mb_xy + 2]=
77 s->current_picture.ref_index[0][xy + wrap + 1]= s->field_select[0][1]; 77 s->current_picture.ref_index[0][4*mb_xy + 3]= s->field_select[0][1];
78 } 78 }
79 79
80 /* no update if 8X8 because it has been done during parsing */ 80 /* no update if 8X8 because it has been done during parsing */
81 s->current_picture.motion_val[0][xy][0] = motion_x; 81 s->current_picture.motion_val[0][xy][0] = motion_x;
82 s->current_picture.motion_val[0][xy][1] = motion_y; 82 s->current_picture.motion_val[0][xy][1] = motion_y;