From 60c9b24df0473d72f3b70ccae761fdf67cf55a37 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 24 Sep 2008 23:24:24 +0000 Subject: [PATCH] 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 Originally committed as revision 15407 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 690efb1a45..64f10f95fe 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1008,7 +1008,7 @@ static inline void pred_direct_motion(H264Context * const h, int *mb_type){ 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; }