diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-01-17 22:28:46 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-03-21 11:27:15 +0100 |
| commit | e9b2383bf86b38ad18a001801aee20c8182e29bd (patch) | |
| tree | 50bad1112c3c41b413a8433a81947d33dd79fd8b /libavcodec/h264_mb.c | |
| parent | bc98e8c0e0a8babfea35c98855e366b29cbe1191 (diff) | |
| download | ffmpeg-e9b2383bf86b38ad18a001801aee20c8182e29bd.tar.gz | |
h264: move mb_mbaff into the per-slice context
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 e3dce36df3..31e372bc25 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 @@ -516,10 +516,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; } } |