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/decoder/dequantize.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/decoder/dequantize.c')
| -rw-r--r-- | vp8/decoder/dequantize.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/vp8/decoder/dequantize.c b/vp8/decoder/dequantize.c index 0e17cf9af..956acba8f 100644 --- a/vp8/decoder/dequantize.c +++ b/vp8/decoder/dequantize.c @@ -36,7 +36,7 @@ void vp8_dequantize_b_c(BLOCKD *d) for (i = 0; i < 16; i++) { - DQ[i] = Q[i] * DQC[i]; + DQ[i] = Q[i] * DQC[i]; } } @@ -50,12 +50,12 @@ void vp8_dequant_idct_add_c(short *input, short *dq, unsigned char *pred, for (i = 0; i < 16; i++) { - input[i] = dq[i] * input[i]; - + input[i] = dq[i] * input[i]; } /* the idct halves ( >> 1) the pitch */ vp8_short_idct4x4llm_c(input, output, 4 << 1); + vpx_memset(input, 0, 32); for (r = 0; r < 4; r++) @@ -88,17 +88,18 @@ void vp8_dequant_dc_idct_add_c(short *input, short *dq, unsigned char *pred, short *diff_ptr = output; int r, c; - input[0] = (short)Dc; for (i = 1; i < 16; i++) { - input[i] = dq[i] * input[i]; + input[i] = dq[i] * input[i]; } /* the idct halves ( >> 1) the pitch */ vp8_short_idct4x4llm_c(input, output, 4 << 1); + vpx_memset(input, 0, 32); + for (r = 0; r < 4; r++) { for (c = 0; c < 4; c++) |