diff options
| author | John Koleszar <jkoleszar@google.com> | 2012-08-21 10:10:43 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-08-21 10:10:43 -0700 |
| commit | 6612a43ce299b16600457d5aef388378afbec192 (patch) | |
| tree | 3da779a21a14c6bb4c4af244018e31b77ff03a12 /vp8/common/reconintra.c | |
| parent | 978e4d0445d46a5b1d2657a50d66d8f138f839b6 (diff) | |
| parent | fb44d3e1da2982fef17cca17bd6c421e98273087 (diff) | |
| download | libvpx-6612a43ce299b16600457d5aef388378afbec192.tar libvpx-6612a43ce299b16600457d5aef388378afbec192.tar.gz libvpx-6612a43ce299b16600457d5aef388378afbec192.tar.bz2 libvpx-6612a43ce299b16600457d5aef388378afbec192.zip | |
Merge changes I96cd08c9,If8eeb8ff into experimental
* changes:
hybridtransform8x8: fix compilation
comp_intra_pred: fix compilation
Diffstat (limited to 'vp8/common/reconintra.c')
| -rw-r--r-- | vp8/common/reconintra.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/vp8/common/reconintra.c b/vp8/common/reconintra.c index d858cd153..e391fa9be 100644 --- a/vp8/common/reconintra.c +++ b/vp8/common/reconintra.c @@ -358,10 +358,12 @@ void vp8_build_comp_intra_predictors_mby(MACROBLOCKD *xd) { vp8_build_intra_predictors_internal(xd, xd->dst.y_buffer, xd->dst.y_stride, predictor[0], 16, - xd->mode_info_context->mbmi.mode); + xd->mode_info_context->mbmi.mode, + 16); vp8_build_intra_predictors_internal(xd, xd->dst.y_buffer, xd->dst.y_stride, predictor[1], 16, - xd->mode_info_context->mbmi.second_mode); + xd->mode_info_context->mbmi.second_mode, + 16); for (i = 0; i < 256; i++) { xd->predictor[i] = (predictor[0][i] + predictor[1][i] + 1) >> 1; @@ -411,10 +413,10 @@ void vp8_build_comp_intra_predictors_mbuv(MACROBLOCKD *xd) { vp8_build_intra_predictors_mbuv_internal( xd, predictor[0][0], predictor[1][0], 8, - xd->mode_info_context->mbmi.uv_mode); + xd->mode_info_context->mbmi.uv_mode, 8); vp8_build_intra_predictors_mbuv_internal( xd, predictor[0][1], predictor[1][1], 8, - xd->mode_info_context->mbmi.second_uv_mode); + xd->mode_info_context->mbmi.second_uv_mode, 8); for (i = 0; i < 64; i++) { xd->predictor[256 + i] = (predictor[0][0][i] + predictor[0][1][i] + 1) >> 1; xd->predictor[256 + 64 + i] = (predictor[1][0][i] + |