Mercurial > libavcodec.hg

diff h264.c @ 7918:84b37de61d98 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author michael
date Wed, 24 Sep 2008 23:24:24 +0000
parents 8eb69709a934
children 17b22bf9fac6
line wrap: on
line diff
--- 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;
         }