# HG changeset patch # User michael # Date 1221963831 0 # Node ID 004f3c69fe7bc8a01da14b98f3df1355027ec660 # Parent 3557386b7a976d59009c4694ed778d6b9582bac8 Move direct_dist_scale_factor() and direct_ref_list_init() after fill_mbaff_ref_list() as future changes will need the mbaff lists inited. diff -r 3557386b7a97 -r 004f3c69fe7b h264.c --- a/h264.c Sun Sep 21 02:19:45 2008 +0000 +++ b/h264.c Sun Sep 21 02:23:51 2008 +0000 @@ -2919,9 +2919,6 @@ } } - 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 @@ 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){