[FFmpeg-cvslog] r15374 - trunk/libavcodec/h264.c

[michael]

Author: michael
Date: Sun Sep 21 04:23:51 2008
New Revision: 15374

Log:
Move direct_dist_scale_factor() and direct_ref_list_init() after fill_mbaff_ref_list()
as future changes will need the mbaff lists inited.


Modified:
   trunk/libavcodec/h264.c

Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c	(original)
+++ trunk/libavcodec/h264.c	Sun Sep 21 04:23:51 2008
@@ -2919,9 +2919,6 @@ static int decode_ref_pic_list_reorderin
         }
     }
 
-    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(H264Conte
     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){