changeset 7897:004f3c69fe7b libavcodec

Move direct_dist_scale_factor() and direct_ref_list_init() after fill_mbaff_ref_list() as future changes will need the mbaff lists inited.
author michael
date Sun, 21 Sep 2008 02:23:51 +0000
parents 3557386b7a97
children a33287a39a55
files h264.c
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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){