Mercurial > libavcodec.hg

changeset 7484:74f16dd7abc6 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
The code under FRAME_MBAFF for temporal direct mode MBs is needed for PAFF as well.
author michael
date Mon, 04 Aug 2008 22:59:53 +0000
parents edea5d7db24d
children e6c14a62db74
files h264.c
diffstat 1 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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 */