summaryrefslogtreecommitdiff
path: root/libavcodec/h264_slice.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2015-01-17 22:28:46 +0100
committerAnton Khirnov <anton@khirnov.net>2015-03-21 11:27:12 +0100
commit8b00f4df20f4a8ab0656fdaf7d00233a6515a052 (patch)
treed38eecad62cb1b7881766f1103a24804864017bd /libavcodec/h264_slice.c
parent4bd5ac200d15b4f458a50f66006549825f9fc865 (diff)
h264: move some neighbour information into the per-slice context
Diffstat (limited to 'libavcodec/h264_slice.c')
-rw-r--r--libavcodec/h264_slice.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index c69dac9068..b40757b140 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -1932,9 +1932,9 @@ static int fill_filter_caches(H264Context *h, H264SliceContext *sl, int mb_type)
}
}
- h->top_mb_xy = top_xy;
- h->left_mb_xy[LTOP] = left_xy[LTOP];
- h->left_mb_xy[LBOT] = left_xy[LBOT];
+ sl->top_mb_xy = top_xy;
+ sl->left_mb_xy[LTOP] = left_xy[LTOP];
+ sl->left_mb_xy[LBOT] = left_xy[LBOT];
{
/* For sufficiently low qp, filtering wouldn't do anything.
* This is a conservative estimate: could also check beta_offset
@@ -1970,9 +1970,9 @@ static int fill_filter_caches(H264Context *h, H264SliceContext *sl, int mb_type)
if (h->slice_table[left_xy[LBOT]] == 0xFFFF)
left_type[LTOP] = left_type[LBOT] = 0;
}
- h->top_type = top_type;
- h->left_type[LTOP] = left_type[LTOP];
- h->left_type[LBOT] = left_type[LBOT];
+ sl->top_type = top_type;
+ sl->left_type[LTOP] = left_type[LTOP];
+ sl->left_type[LBOT] = left_type[LBOT];
if (IS_INTRA(mb_type))
return 0;