diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-01-17 22:28:46 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-03-21 11:27:13 +0100 |
| commit | 5f390eef8ee2b8adab00c5d2923a52aa261eb999 (patch) | |
| tree | 795f383dbe4f784c2d9bebe4ea517efc6241606b /libavcodec/h264_mc_template.c | |
| parent | 99a35d1ccbb6b6cd260ce5c8369a897a79fe6a3a (diff) | |
h264: move mb_[uv]linesize into the per-slice context
Diffstat (limited to 'libavcodec/h264_mc_template.c')
| -rw-r--r-- | libavcodec/h264_mc_template.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264_mc_template.c b/libavcodec/h264_mc_template.c index 11d7d1f831..27e62f0728 100644 --- a/libavcodec/h264_mc_template.c +++ b/libavcodec/h264_mc_template.c @@ -95,11 +95,11 @@ static void MCFUNC(hl_motion)(H264Context *h, H264SliceContext *sl, weight_op, weight_avg, IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1)); } else if (IS_8X16(mb_type)) { - mc_part(h, sl, 0, 0, 16, 8 * h->mb_linesize, dest_y, dest_cb, dest_cr, 0, 0, + mc_part(h, sl, 0, 0, 16, 8 * sl->mb_linesize, dest_y, dest_cb, dest_cr, 0, 0, qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], &weight_op[1], &weight_avg[1], IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); - mc_part(h, sl, 4, 0, 16, 8 * h->mb_linesize, dest_y, dest_cb, dest_cr, 4, 0, + mc_part(h, sl, 4, 0, 16, 8 * sl->mb_linesize, dest_y, dest_cb, dest_cr, 4, 0, qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], &weight_op[1], &weight_avg[1], IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1)); @@ -132,12 +132,12 @@ static void MCFUNC(hl_motion)(H264Context *h, H264SliceContext *sl, &weight_op[1], &weight_avg[1], IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); } else if (IS_SUB_4X8(sub_mb_type)) { - mc_part(h, sl, n, 0, 8, 4 * h->mb_linesize, + mc_part(h, sl, n, 0, 8, 4 * sl->mb_linesize, dest_y, dest_cb, dest_cr, x_offset, y_offset, qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], &weight_op[2], &weight_avg[2], IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); - mc_part(h, sl, n + 1, 0, 8, 4 * h->mb_linesize, + mc_part(h, sl, n + 1, 0, 8, 4 * sl->mb_linesize, dest_y, dest_cb, dest_cr, x_offset + 2, y_offset, qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], &weight_op[2], &weight_avg[2], |