diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 18:07:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 18:07:01 +0100 |
| commit | 9d0450ae943a7d1071fa59bfd0c4f7647d733c5f (patch) | |
| tree | d1ebfb43b856fa79589c3e67580e7e6deb631c1b /libavcodec/h264_mb.c | |
| parent | d511dc653062502ac7a86d9ef47ffeabd6f77364 (diff) | |
| parent | e9b2383bf86b38ad18a001801aee20c8182e29bd (diff) | |
Merge commit 'e9b2383bf86b38ad18a001801aee20c8182e29bd'
* commit 'e9b2383bf86b38ad18a001801aee20c8182e29bd':
h264: move mb_mbaff into the per-slice context
Conflicts:
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_mb.c')
| -rw-r--r-- | libavcodec/h264_mb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h264_mb.c b/libavcodec/h264_mb.c index dcd65a9464..b33c63c130 100644 --- a/libavcodec/h264_mb.c +++ b/libavcodec/h264_mb.c @@ -173,7 +173,7 @@ static void await_references(const H264Context *h, H264SliceContext *sl) int ref_field_picture = ref_pic->field_picture; int pic_height = 16 * h->mb_height >> ref_field_picture; - row <<= MB_MBAFF(h); + row <<= MB_MBAFF(sl); nrefs[list]--; if (!FIELD_PICTURE(h) && ref_field_picture) { // frame referencing two fields @@ -520,10 +520,10 @@ static av_always_inline void xchg_mb_border(const H264Context *h, H264SliceConte if (!simple && FRAME_MBAFF(h)) { if (sl->mb_y & 1) { - if (!MB_MBAFF(h)) + if (!MB_MBAFF(sl)) return; } else { - top_idx = MB_MBAFF(h) ? 0 : 1; + top_idx = MB_MBAFF(sl) ? 0 : 1; } } |