From: Yaowu Xu Date: Wed, 20 Feb 2013 00:26:27 +0000 (-0800) Subject: fixed an enc/dec mis-match issue X-Git-Tag: v1.3.0~1151^2~157^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b13f38d4b30da22025dda3b188fb360780714643;p=libvpx fixed an enc/dec mis-match issue The issue was caused by a out-of-order merge, which leads to wrong functions are called at lossless mode. Change-Id: If157729abab62954c729e0377e7f53edb7db22ca --- diff --git a/vp9/decoder/vp9_idct_blk.c b/vp9/decoder/vp9_idct_blk.c index a00ff7306..b2caf4524 100644 --- a/vp9/decoder/vp9_idct_blk.c +++ b/vp9/decoder/vp9_idct_blk.c @@ -25,9 +25,9 @@ void vp9_dequant_idct_add_y_block_4x4_inplace_c(int16_t *q, for (i = 0; i < 4; i++) { for (j = 0; j < 4; j++) { if (*eobs++ > 1) { - vp9_dequant_idct_add_c(q, dq, dst, dst, stride, stride); + xd->itxm_add(q, dq, dst, dst, stride, stride); } else { - vp9_dc_only_idct_add_c(q[0]*dq[0], dst, dst, stride, stride); + xd->dc_only_itxm_add(q[0]*dq[0], dst, dst, stride, stride); ((int *)q)[0] = 0; }