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/decoder/dequantize.h | |
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/decoder/dequantize.h')
-rw-r--r-- | vp8/decoder/dequantize.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp8/decoder/dequantize.h b/vp8/decoder/dequantize.h index 15d5bbe91..5ae6f9619 100644 --- a/vp8/decoder/dequantize.h +++ b/vp8/decoder/dequantize.h @@ -42,7 +42,7 @@ unsigned char *pre, unsigned char *dst_u, \ unsigned char *dst_v, int stride, char *eobs) -#if 1//CONFIG_T8X8 +#if CONFIG_T8X8 #define prototype_dequant_dc_idct_add_y_block_8x8(sym) \ void sym(short *q, short *dq, \ unsigned char *pre, unsigned char *dst, \ |