diff options
| author | Yaowu Xu <yaowu@google.com> | 2011-07-21 16:05:24 +0000 |
|---|---|---|
| committer | On2 (Google) Code Review <on2-gerrit@google.com> | 2011-07-21 16:05:24 +0000 |
| commit | f6146612425ffc7523930e79ba43a253a7540693 (patch) | |
| tree | f54fc1ff4ae39ef7a7751ccc628da1504e1d6035 /vp8/encoder/encodemb.c | |
| parent | a53586d9d1dfcdf49b418a453f2d69dd230b9088 (diff) | |
| parent | 8c31484ea1fbac128e31a951a004f6f91bc1ef2f (diff) | |
| download | libvpx-f6146612425ffc7523930e79ba43a253a7540693.tar libvpx-f6146612425ffc7523930e79ba43a253a7540693.tar.gz libvpx-f6146612425ffc7523930e79ba43a253a7540693.tar.bz2 libvpx-f6146612425ffc7523930e79ba43a253a7540693.zip | |
Merge "fix more merge issues" into experimental
Diffstat (limited to 'vp8/encoder/encodemb.c')
| -rw-r--r-- | vp8/encoder/encodemb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vp8/encoder/encodemb.c b/vp8/encoder/encodemb.c index 00a19bd88..408a5956e 100644 --- a/vp8/encoder/encodemb.c +++ b/vp8/encoder/encodemb.c @@ -122,6 +122,7 @@ static void build_dcblock(MACROBLOCK *x) src_diff_ptr[i] = x->coeff[i * 16]; } } +#if CONFIG_T8X8 void vp8_build_dcblock_8x8(MACROBLOCK *x) { short *src_diff_ptr = &x->src_diff[384]; @@ -135,7 +136,7 @@ void vp8_build_dcblock_8x8(MACROBLOCK *x) src_diff_ptr[4] = x->coeff[8 * 16]; src_diff_ptr[8] = x->coeff[12 * 16]; } - +#endif void vp8_transform_mbuv(MACROBLOCK *x) { int i; |