From 8b00f4df20f4a8ab0656fdaf7d00233a6515a052 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 17 Jan 2015 22:28:46 +0100 Subject: h264: move some neighbour information into the per-slice context --- libavcodec/h264_mb_template.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libavcodec/h264_mb_template.c') diff --git a/libavcodec/h264_mb_template.c b/libavcodec/h264_mb_template.c index eb34533d15..4dd543a5a2 100644 --- a/libavcodec/h264_mb_template.c +++ b/libavcodec/h264_mb_template.c @@ -159,7 +159,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h, H264SliceContext *sl) } else { if (IS_INTRA(mb_type)) { if (h->deblocking_filter) - xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, + xchg_mb_border(h, sl, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 1, 0, SIMPLE, PIXEL_SHIFT); if (SIMPLE || !CONFIG_GRAY || !(h->flags & CODEC_FLAG_GRAY)) { @@ -172,7 +172,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h, H264SliceContext *sl) block_offset, linesize, dest_y, 0); if (h->deblocking_filter) - xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, + xchg_mb_border(h, sl, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 0, 0, SIMPLE, PIXEL_SHIFT); } else if (is_h264) { if (chroma422) { @@ -343,7 +343,7 @@ static av_noinline void FUNC(hl_decode_mb_444)(H264Context *h, H264SliceContext } else { if (IS_INTRA(mb_type)) { if (h->deblocking_filter) - xchg_mb_border(h, dest[0], dest[1], dest[2], linesize, + xchg_mb_border(h, sl, dest[0], dest[1], dest[2], linesize, linesize, 1, 1, SIMPLE, PIXEL_SHIFT); for (p = 0; p < plane_count; p++) @@ -352,7 +352,7 @@ static av_noinline void FUNC(hl_decode_mb_444)(H264Context *h, H264SliceContext block_offset, linesize, dest[p], p); if (h->deblocking_filter) - xchg_mb_border(h, dest[0], dest[1], dest[2], linesize, + xchg_mb_border(h, sl, dest[0], dest[1], dest[2], linesize, linesize, 0, 1, SIMPLE, PIXEL_SHIFT); } else { FUNC(hl_motion_444)(h, sl, dest[0], dest[1], dest[2], -- cgit v1.2.1