From 5f390eef8ee2b8adab00c5d2923a52aa261eb999 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 17 Jan 2015 22:28:46 +0100 Subject: h264: move mb_[uv]linesize into the per-slice context --- libavcodec/h264_mb_template.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libavcodec/h264_mb_template.c') diff --git a/libavcodec/h264_mb_template.c b/libavcodec/h264_mb_template.c index 6235c1136f..bca415ee99 100644 --- a/libavcodec/h264_mb_template.c +++ b/libavcodec/h264_mb_template.c @@ -67,8 +67,8 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h, H264SliceContext *sl) h->list_counts[mb_xy] = h->list_count; if (!SIMPLE && MB_FIELD(h)) { - linesize = h->mb_linesize = h->linesize * 2; - uvlinesize = h->mb_uvlinesize = h->uvlinesize * 2; + linesize = sl->mb_linesize = h->linesize * 2; + uvlinesize = sl->mb_uvlinesize = h->uvlinesize * 2; block_offset = &h->block_offset[48]; if (mb_y & 1) { // FIXME move out of this function? dest_y -= h->linesize * 15; @@ -94,8 +94,8 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h, H264SliceContext *sl) } } } else { - linesize = h->mb_linesize = h->linesize; - uvlinesize = h->mb_uvlinesize = h->uvlinesize; + linesize = sl->mb_linesize = h->linesize; + uvlinesize = sl->mb_uvlinesize = h->uvlinesize; // dct_offset = s->linesize * 16; } @@ -295,7 +295,7 @@ static av_noinline void FUNC(hl_decode_mb_444)(H264Context *h, H264SliceContext h->list_counts[mb_xy] = h->list_count; if (!SIMPLE && MB_FIELD(h)) { - linesize = h->mb_linesize = h->mb_uvlinesize = h->linesize * 2; + linesize = sl->mb_linesize = sl->mb_uvlinesize = h->linesize * 2; block_offset = &h->block_offset[48]; if (mb_y & 1) // FIXME move out of this function? for (p = 0; p < 3; p++) @@ -319,7 +319,7 @@ static av_noinline void FUNC(hl_decode_mb_444)(H264Context *h, H264SliceContext } } } else { - linesize = h->mb_linesize = h->mb_uvlinesize = h->linesize; + linesize = sl->mb_linesize = sl->mb_uvlinesize = h->linesize; } if (!SIMPLE && IS_INTRA_PCM(mb_type)) { -- cgit v1.2.3