Commit d59c4a7e authored by michael's avatar michael

Fix reference selection for colocated MBs from frames to fields.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@21663 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 3e52e95c
...@@ -123,6 +123,12 @@ void ff_h264_direct_ref_list_init(H264Context * const h){ ...@@ -123,6 +123,12 @@ void ff_h264_direct_ref_list_init(H264Context * const h){
if(cur->pict_type != FF_B_TYPE || h->direct_spatial_mv_pred) if(cur->pict_type != FF_B_TYPE || h->direct_spatial_mv_pred)
return; return;
if(s->picture_structure == PICT_FRAME){
int cur_poc = s->current_picture_ptr->poc;
int *col_poc = h->ref_list[1]->field_poc;
ref1sidx=sidx= (FFABS(col_poc[0] - cur_poc) >= FFABS(col_poc[1] - cur_poc));
}
for(list=0; list<2; list++){ for(list=0; list<2; list++){
fill_colmap(h, h->map_col_to_list0, list, sidx, ref1sidx, 0); fill_colmap(h, h->map_col_to_list0, list, sidx, ref1sidx, 0);
for(field=0; field<2; field++) for(field=0; field<2; field++)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment