Move direct_dist_scale_factor() and direct_ref_list_init() after fill_mbaff_ref_list()

as future changes will need the mbaff lists inited.

Originally committed as revision 15374 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Michael Niedermayer 16 years ago
parent 078f42ddae
commit 8f56e219b2
  1. 7
      libavcodec/h264.c

@ -2919,9 +2919,6 @@ static int decode_ref_pic_list_reordering(H264Context *h){
}
}
if(h->slice_type_nos==FF_B_TYPE && !h->direct_spatial_mv_pred)
direct_dist_scale_factor(h);
direct_ref_list_init(h);
return 0;
}
@ -3913,6 +3910,10 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
if(FRAME_MBAFF)
fill_mbaff_ref_list(h);
if(h->slice_type_nos==FF_B_TYPE && !h->direct_spatial_mv_pred)
direct_dist_scale_factor(h);
direct_ref_list_init(h);
if( h->slice_type_nos != FF_I_TYPE && h->pps.cabac ){
tmp = get_ue_golomb(&s->gb);
if(tmp > 2){

Loading…
Cancel
Save