# HG changeset patch
# User michael
# Date 1222298664 0
# Node ID 84b37de61d98f2c05dc614339582dab8530676b5
# Parent  518c86ed8008aa09f4163a9d047cef6308d7243f
Field -> MBAFF direct mode can use data from fields that are not
in the reference list. Follow the spec and no comment on the sanity of this
design ...
Fixes HPCAMAPALQ_BRCM_B

diff -r 518c86ed8008 -r 84b37de61d98 h264.c
--- a/h264.c	Wed Sep 24 20:31:24 2008 +0000
+++ b/h264.c	Wed Sep 24 23:24:24 2008 +0000
@@ -1008,7 +1008,7 @@
             int col_parity = FFABS(col_poc[0] - cur_poc) >= FFABS(col_poc[1] - cur_poc);
             mb_xy= s->mb_x + ((s->mb_y&~1) + col_parity)*s->mb_stride;
             b8_stride = 0;
-        }else if(!(s->picture_structure & h->ref_list[1][0].reference)){// FL -> FL & differ parity
+        }else if(!(s->picture_structure & h->ref_list[1][0].reference) && !h->ref_list[1][0].mbaff){// FL -> FL & differ parity
             int fieldoff= 2*(h->ref_list[1][0].reference)-3;
             mb_xy += s->mb_stride*fieldoff;
         }