diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-03-14 08:52:54 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-03-14 08:53:02 -0400 |
| commit | ba83622a00b982297f71dccb25ecb9a8047afa4e (patch) | |
| tree | e21963481583fce9c1363ff8116f58ce7e2c90e5 /vp8/decoder | |
| parent | 601781138241d506bed2c4cdb285a51714dce380 (diff) | |
| parent | 3788b3564c587983a10d7131b35c0d9c39540666 (diff) | |
| download | libvpx-ba83622a00b982297f71dccb25ecb9a8047afa4e.tar libvpx-ba83622a00b982297f71dccb25ecb9a8047afa4e.tar.gz libvpx-ba83622a00b982297f71dccb25ecb9a8047afa4e.tar.bz2 libvpx-ba83622a00b982297f71dccb25ecb9a8047afa4e.zip | |
Merge remote branch 'internal/upstream' into HEAD
Conflicts:
vp8/encoder/onyx_if.c
Change-Id: Ieef9a58a2effdc68cf52bc5f14d90c31a1dbc13a
Diffstat (limited to 'vp8/decoder')
| -rw-r--r-- | vp8/decoder/decodframe.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c index 7089c92de..dde49c803 100644 --- a/vp8/decoder/decodframe.c +++ b/vp8/decoder/decodframe.c @@ -115,8 +115,8 @@ static void skip_recon_mb(VP8D_COMP *pbi, MACROBLOCKD *xd) { vp8_build_intra_predictors_mbuv_s(xd); - vp8_build_intra_predictors_mby_s_ptr(xd); - + RECON_INVOKE(&pbi->common.rtcd.recon, + build_intra_predictors_mby_s)(xd); } else { @@ -214,7 +214,8 @@ void vp8_decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd) if (xd->mode_info_context->mbmi.mode != B_PRED) { - vp8_build_intra_predictors_mby_ptr(xd); + RECON_INVOKE(&pbi->common.rtcd.recon, + build_intra_predictors_mby)(xd); } else { vp8_intra_prediction_down_copy(xd); } |