mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
indent
Originally committed as revision 15379 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
53c193a9b0
commit
471341a7f3
@ -988,11 +988,11 @@ static inline void pred_direct_motion(H264Context * const h, int *mb_type){
|
||||
|
||||
if(IS_INTERLACED(h->ref_list[1][0].mb_type[mb_xy])){ // AFL/AFR/FR/FL -> AFL/FL
|
||||
if(!IS_INTERLACED(*mb_type)){ // AFR/FR -> AFL/FL
|
||||
int cur_poc = s->current_picture_ptr->poc;
|
||||
int *col_poc = h->ref_list[1]->field_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;
|
||||
b8_stride = 0;
|
||||
int cur_poc = s->current_picture_ptr->poc;
|
||||
int *col_poc = h->ref_list[1]->field_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;
|
||||
b8_stride = 0;
|
||||
}else if(!(s->picture_structure & h->ref_list[1][0].reference)){// FL -> FL & differ parity
|
||||
int fieldoff= 2*(h->ref_list[1][0].reference)-3;
|
||||
mb_xy += s->mb_stride*fieldoff;
|
||||
|
Loading…
Reference in New Issue
Block a user