diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-04-01 00:05:12 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-04-01 00:05:12 -0400 |
| commit | 88ed17298f9eb08f18b3544ecc44b0cf3f12a8aa (patch) | |
| tree | bd6d14961ef779bfd428acc20c9efcf5987e3aaa /vp8/encoder/arm/arm_csystemdependent.c | |
| parent | 23afb5810e9f0682d66b7f2a734545413121e04d (diff) | |
| parent | 9d138379a258ba6019a338ec748ebbd2aab1ba15 (diff) | |
| download | libvpx-88ed17298f9eb08f18b3544ecc44b0cf3f12a8aa.tar libvpx-88ed17298f9eb08f18b3544ecc44b0cf3f12a8aa.tar.gz libvpx-88ed17298f9eb08f18b3544ecc44b0cf3f12a8aa.tar.bz2 libvpx-88ed17298f9eb08f18b3544ecc44b0cf3f12a8aa.zip | |
Merge remote branch 'origin/master' into experimental
Change-Id: Ie59ab2f2e93464df0f484bd73d2394d05640536d
Diffstat (limited to 'vp8/encoder/arm/arm_csystemdependent.c')
| -rw-r--r-- | vp8/encoder/arm/arm_csystemdependent.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp8/encoder/arm/arm_csystemdependent.c b/vp8/encoder/arm/arm_csystemdependent.c index d4a88dc94..f148b8997 100644 --- a/vp8/encoder/arm/arm_csystemdependent.c +++ b/vp8/encoder/arm/arm_csystemdependent.c @@ -66,10 +66,10 @@ void vp8_arch_arm_encoder_init(VP8_COMP *cpi) /*cpi->rtcd.encodemb.berr = vp8_block_error_c; cpi->rtcd.encodemb.mberr = vp8_mbblock_error_c; - cpi->rtcd.encodemb.mbuverr = vp8_mbuverror_c; - cpi->rtcd.encodemb.subb = vp8_subtract_b_c; - cpi->rtcd.encodemb.submby = vp8_subtract_mby_c; - cpi->rtcd.encodemb.submbuv = vp8_subtract_mbuv_c;*/ + cpi->rtcd.encodemb.mbuverr = vp8_mbuverror_c;*/ + cpi->rtcd.encodemb.subb = vp8_subtract_b_armv6; + cpi->rtcd.encodemb.submby = vp8_subtract_mby_armv6; + cpi->rtcd.encodemb.submbuv = vp8_subtract_mbuv_armv6; /*cpi->rtcd.quantize.quantb = vp8_regular_quantize_b;*/ cpi->rtcd.quantize.fastquantb = vp8_fast_quantize_b_armv6; |