[SCM] libav/experimental: 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

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 60c9b24df0473d72f3b70ccae761fdf67cf55a37
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Wed Sep 24 23:24:24 2008 +0000

    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

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 690efb1..64f10f9 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;
         }

-- 
Libav/FFmpeg packaging