From 92c6c2a605f9b077b8fbc25b7ed6625541232b87 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 17 Jan 2015 18:45:29 +0100 Subject: h264: split weighted pred-related vars into per-slice context --- libavcodec/h264_refs.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libavcodec/h264_refs.c') diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 03c1b9c6c3..3357d2cc94 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -337,7 +337,7 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h) return 0; } -void ff_h264_fill_mbaff_ref_list(H264Context *h) +void ff_h264_fill_mbaff_ref_list(H264Context *h, H264SliceContext *sl) { int list, i, j; for (list = 0; list < 2; list++) { //FIXME try list_count @@ -355,11 +355,11 @@ void ff_h264_fill_mbaff_ref_list(H264Context *h) field[1].reference = PICT_BOTTOM_FIELD; field[1].poc = field[1].field_poc[1]; - h->luma_weight[16 + 2 * i][list][0] = h->luma_weight[16 + 2 * i + 1][list][0] = h->luma_weight[i][list][0]; - h->luma_weight[16 + 2 * i][list][1] = h->luma_weight[16 + 2 * i + 1][list][1] = h->luma_weight[i][list][1]; + sl->luma_weight[16 + 2 * i][list][0] = sl->luma_weight[16 + 2 * i + 1][list][0] = sl->luma_weight[i][list][0]; + sl->luma_weight[16 + 2 * i][list][1] = sl->luma_weight[16 + 2 * i + 1][list][1] = sl->luma_weight[i][list][1]; for (j = 0; j < 2; j++) { - h->chroma_weight[16 + 2 * i][list][j][0] = h->chroma_weight[16 + 2 * i + 1][list][j][0] = h->chroma_weight[i][list][j][0]; - h->chroma_weight[16 + 2 * i][list][j][1] = h->chroma_weight[16 + 2 * i + 1][list][j][1] = h->chroma_weight[i][list][j][1]; + sl->chroma_weight[16 + 2 * i][list][j][0] = sl->chroma_weight[16 + 2 * i + 1][list][j][0] = sl->chroma_weight[i][list][j][0]; + sl->chroma_weight[16 + 2 * i][list][j][1] = sl->chroma_weight[16 + 2 * i + 1][list][j][1] = sl->chroma_weight[i][list][j][1]; } } } -- cgit v1.2.3