ref: aedc7c59b1a8d5006581a5b38d634ff4a262f876
parent: decead7336246aa9f17469ae784c1ba0dc24b210
parent: 18803f9cc4386e8631090471a948a3baad3fb3c0
author: Jingning Han <jingning@google.com>
date: Wed Jul 10 16:13:25 EDT 2013
Merge "Fix tx_type bug in intra4x4 rd loop"
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -1288,9 +1288,9 @@
block, 16),
16, &ssz) >> 2;
- if (best_tx_type != DCT_DCT)
+ if (tx_type != DCT_DCT)
vp9_short_iht4x4_add(BLOCK_OFFSET(pd->dqcoeff, block, 16),
- dst, pd->dst.stride, best_tx_type);
+ dst, pd->dst.stride, tx_type);
else
xd->inv_txm4x4_add(BLOCK_OFFSET(pd->dqcoeff, block, 16),
dst, pd->dst.stride);
--
⑨