diff options
| author | Yaowu Xu <yaowu@google.com> | 2011-07-20 14:21:24 -0700 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2011-07-21 09:01:53 -0700 |
| commit | 8c31484ea1fbac128e31a951a004f6f91bc1ef2f (patch) | |
| tree | b99e86871914df1d57717d07b694eb7837d29ae3 /vp8/common/recon.c | |
| parent | 1c24eb2b7b3a61893ea19e9e544c24a233f89921 (diff) | |
| download | libvpx-8c31484ea1fbac128e31a951a004f6f91bc1ef2f.tar libvpx-8c31484ea1fbac128e31a951a004f6f91bc1ef2f.tar.gz libvpx-8c31484ea1fbac128e31a951a004f6f91bc1ef2f.tar.bz2 libvpx-8c31484ea1fbac128e31a951a004f6f91bc1ef2f.zip | |
fix more merge issues
With this fix, the experimental branch now builds and encodes correctly
with the following two configure options respectively:
--enable-experimental --enable-t8x8
--enable-experimental
Change-Id: I3147c33c503fe713a85fd371e4f1a974805778bf
Diffstat (limited to 'vp8/common/recon.c')
| -rw-r--r-- | vp8/common/recon.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/vp8/common/recon.c b/vp8/common/recon.c index c82639645..d72d6e410 100644 --- a/vp8/common/recon.c +++ b/vp8/common/recon.c @@ -12,7 +12,7 @@ #include "vpx_ports/config.h" #include "recon.h" #include "blockd.h" -#include <stdio.h> + void vp8_recon_b_c ( unsigned char *pred_ptr, @@ -133,7 +133,6 @@ void vp8_recon_mby_c(const vp8_recon_rtcd_vtable_t *rtcd, MACROBLOCKD *x) RECON_INVOKE(rtcd, recon4)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride); } #endif - } void vp8_recon_mb_c(const vp8_recon_rtcd_vtable_t *rtcd, MACROBLOCKD *x) @@ -172,7 +171,6 @@ void vp8_recon_mb_c(const vp8_recon_rtcd_vtable_t *rtcd, MACROBLOCKD *x) RECON_INVOKE(rtcd, recon4)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride); } - for (i = 16; i < 24; i += 2) { BLOCKD *b = &x->block[i]; @@ -180,5 +178,4 @@ void vp8_recon_mb_c(const vp8_recon_rtcd_vtable_t *rtcd, MACROBLOCKD *x) RECON_INVOKE(rtcd, recon2)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride); } #endif - } |