# HG changeset patch
# User michael
# Date 1217890793 0
# Node ID 74f16dd7abc6b406da2de89ccc09c06b6abadff8
# Parent  edea5d7db24d92f89b4d27098e5d346b57642569
The code under FRAME_MBAFF for temporal direct mode MBs is needed for PAFF as well.

diff -r edea5d7db24d -r 74f16dd7abc6 h264.c
--- a/h264.c	Mon Aug 04 22:52:54 2008 +0000
+++ b/h264.c	Mon Aug 04 22:59:53 2008 +0000
@@ -1150,8 +1150,7 @@
         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 @@
                 }
                 return;
             }
-        }
 
         /* one-to-one mv scaling */