diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:13:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:13:12 +0100 |
| commit | 756dc7bd18b88fdde5c06c701375a6570500e58c (patch) | |
| tree | 731502f3a57bdcc81d35202cc50da7770f38ef68 /libavcodec/h264_refs.c | |
| parent | 06c70d45373dedc600f28e345685b130b60203c1 (diff) | |
| parent | 92c6c2a605f9b077b8fbc25b7ed6625541232b87 (diff) | |
Merge commit '92c6c2a605f9b077b8fbc25b7ed6625541232b87'
* commit '92c6c2a605f9b077b8fbc25b7ed6625541232b87':
h264: split weighted pred-related vars into per-slice context
Conflicts:
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_mb.c
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_refs.c')
| -rw-r--r-- | libavcodec/h264_refs.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 75025dc3fe..ce5304998b 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -341,7 +341,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 < h->list_count; list++) { @@ -359,11 +359,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]; } } } |