Mercurial > libavcodec.hg

comparison h264.c @ 7900:37f62a3dc645 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Correct comment in the direct mode code. (note, yes this is unrelated to the previous simplification, the code always behaved like it is documented now.)
author michael
date Sun, 21 Sep 2008 23:49:53 +0000
parents d63895a8eabb
children a7d78c0657f1
comparison
equal deleted inserted replaced
7899:d63895a8eabb 7900:37f62a3dc645
985 int i8, i4; 985 int i8, i4;
986 986
987 #define MB_TYPE_16x16_OR_INTRA (MB_TYPE_16x16|MB_TYPE_INTRA4x4|MB_TYPE_INTRA16x16|MB_TYPE_INTRA_PCM) 987 #define MB_TYPE_16x16_OR_INTRA (MB_TYPE_16x16|MB_TYPE_INTRA4x4|MB_TYPE_INTRA16x16|MB_TYPE_INTRA_PCM)
988 988
989 if(IS_INTERLACED(h->ref_list[1][0].mb_type[mb_xy])){ // AFL/AFR/FR/FL -> AFL/FL 989 if(IS_INTERLACED(h->ref_list[1][0].mb_type[mb_xy])){ // AFL/AFR/FR/FL -> AFL/FL
990 if(!IS_INTERLACED(*mb_type)){ // AFR/FR -> AFL 990 if(!IS_INTERLACED(*mb_type)){ // AFR/FR -> AFL/FL
991 int cur_poc = s->current_picture_ptr->poc; 991 int cur_poc = s->current_picture_ptr->poc;
992 int *col_poc = h->ref_list[1]->field_poc; 992 int *col_poc = h->ref_list[1]->field_poc;
993 int col_parity = FFABS(col_poc[0] - cur_poc) >= FFABS(col_poc[1] - cur_poc); 993 int col_parity = FFABS(col_poc[0] - cur_poc) >= FFABS(col_poc[1] - cur_poc);
994 mb_xy= s->mb_x + ((s->mb_y&~1) + col_parity)*s->mb_stride; 994 mb_xy= s->mb_x + ((s->mb_y&~1) + col_parity)*s->mb_stride;
995 b8_stride = 0; 995 b8_stride = 0;