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

[michael]

Author: michael
Date: Tue Aug  5 00:59:53 2008
New Revision: 14542

Log:
The code under FRAME_MBAFF for temporal direct mode MBs is needed for PAFF as well.


Modified:
   trunk/libavcodec/h264.c

Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c	(original)
+++ trunk/libavcodec/h264.c	Tue Aug  5 00:59:53 2008
@@ -1150,8 +1150,7 @@ static inline void pred_direct_motion(H2
         const int *map_col_to_list0[2] = {h->map_col_to_list0[0], h->map_col_to_list0[1]};
         const int *dist_scale_factor = h->dist_scale_factor;
 
-        if(FRAME_MBAFF){
-            if(IS_INTERLACED(*mb_type)){
+            if(FRAME_MBAFF && IS_INTERLACED(*mb_type)){
                 map_col_to_list0[0] = h->map_col_to_list0_field[0];
                 map_col_to_list0[1] = h->map_col_to_list0_field[1];
                 dist_scale_factor = h->dist_scale_factor_field;
@@ -1244,7 +1243,6 @@ static inline void pred_direct_motion(H2
                 }
                 return;
             }
-        }
 
         /* one-to-one mv scaling */