mirror of https://git.ffmpeg.org/ffmpeg.git
Field -> MBAFF direct mode can use data from fields that are not
in the reference list. Follow the spec and no comment on the sanity of this design ... Fixes HPCAMAPALQ_BRCM_B Originally committed as revision 15407 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
c75a0cce5b
commit
60c9b24df0
|
@ -1008,7 +1008,7 @@ static inline void pred_direct_motion(H264Context * const h, int *mb_type){
|
||||||
int col_parity = FFABS(col_poc[0] - cur_poc) >= FFABS(col_poc[1] - cur_poc);
|
int col_parity = FFABS(col_poc[0] - cur_poc) >= FFABS(col_poc[1] - cur_poc);
|
||||||
mb_xy= s->mb_x + ((s->mb_y&~1) + col_parity)*s->mb_stride;
|
mb_xy= s->mb_x + ((s->mb_y&~1) + col_parity)*s->mb_stride;
|
||||||
b8_stride = 0;
|
b8_stride = 0;
|
||||||
}else if(!(s->picture_structure & h->ref_list[1][0].reference)){// FL -> FL & differ parity
|
}else if(!(s->picture_structure & h->ref_list[1][0].reference) && !h->ref_list[1][0].mbaff){// FL -> FL & differ parity
|
||||||
int fieldoff= 2*(h->ref_list[1][0].reference)-3;
|
int fieldoff= 2*(h->ref_list[1][0].reference)-3;
|
||||||
mb_xy += s->mb_stride*fieldoff;
|
mb_xy += s->mb_stride*fieldoff;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue