ref: eaadefdfdcae57748d2ad6d738c5fa149a49d3d0
parent: 3fda7a665d432fdf2650ec8a455a3d0aeec919e6
parent: 32fe72eb3c93b288c4b09c452fd6de2719ffc7ec
author: Deb Mukherjee <debargha@google.com>
date: Tue Aug 14 05:21:40 EDT 2012
Merge "Some build fixes" into experimental
--- a/vp8/common/reconinter.c
+++ b/vp8/common/reconinter.c
@@ -712,7 +712,7 @@
Temp, len, len, len);
// Sub-pel filter
- x->subpixel_predict8x8(pTemp, len,
+ xd->subpixel_predict8x8(pTemp, len,
_o16x16mv.as_mv.col & 15,
_o16x16mv.as_mv.row & 15,
pDst, dst_uvstride);
--- a/vp8/decoder/detokenize.c
+++ b/vp8/decoder/detokenize.c
@@ -106,7 +106,7 @@
xd->mode_info_context->mbmi.mode != I8X8_PRED &&
xd->mode_info_context->mbmi.mode != SPLITMV)
#if CONFIG_TX16X16
- || x->mode_info_context->mbmi.txfm_size == TX_16X16
+ || xd->mode_info_context->mbmi.txfm_size == TX_16X16
#endif
) {vpx_memset(xd->above_context, 0, sizeof(ENTROPY_CONTEXT_PLANES));
--
⑨