generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Some build fixes" into experimental

Browse Source
This commit is contained in:
Deb Mukherjee
2012-08-14 09:21:40 -07:00
committed by Gerrit Code Review
parent 3fda7a665d 32fe72eb3c
commit eaadefdfdc
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vp8/common/reconinter.c
View File

@@ -712,7 +712,7 @@ void vp8_build_1st_inter16x16_predictors_mbuv(MACROBLOCKD *xd,
Temp, len, len, len); Temp, len, len, len);
// Sub-pel filter // Sub-pel filter
x->subpixel_predict8x8(pTemp, len, xd->subpixel_predict8x8(pTemp, len,
_o16x16mv.as_mv.col & 15, _o16x16mv.as_mv.col & 15,
_o16x16mv.as_mv.row & 15, _o16x16mv.as_mv.row & 15,
pDst, dst_uvstride); pDst, dst_uvstride);

2
vp8/decoder/detokenize.c
View File

@@ -106,7 +106,7 @@ void vp8_reset_mb_tokens_context(MACROBLOCKD *xd) {
xd->mode_info_context->mbmi.mode != I8X8_PRED && xd->mode_info_context->mbmi.mode != I8X8_PRED &&
xd->mode_info_context->mbmi.mode != SPLITMV) xd->mode_info_context->mbmi.mode != SPLITMV)
#if CONFIG_TX16X16 #if CONFIG_TX16X16
|| x->mode_info_context->mbmi.txfm_size == TX_16X16 || xd->mode_info_context->mbmi.txfm_size == TX_16X16
#endif #endif
) { ) {
vpx_memset(xd->above_context, 0, sizeof(ENTROPY_CONTEXT_PLANES)); vpx_memset(xd->above_context, 0, sizeof(ENTROPY_CONTEXT_PLANES));