diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-09-24 23:24:24 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-09-24 23:24:24 +0000 |
| commit | 60c9b24df0473d72f3b70ccae761fdf67cf55a37 (patch) | |
| tree | 03a438262c1d0c90cdcd3d28376cd025251a340a /libavcodec/h264.c | |
| parent | c75a0cce5bc3b53489979cb20af35c0e0b0db382 (diff) | |
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
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |