From 45b4832ffdadaadf2afe9ad33500dfbce7a6c3a9 Mon Sep 17 00:00:00 2001 From: John Koleszar Date: Wed, 24 Oct 2012 12:59:22 -0700 Subject: [PATCH] Fix bad merge of coef_probs update Stray CONFIG_HYBRIDTRANSFORM caused decode mismatch. Change-Id: I1d77bad9b366f7a6ceb3cb45269ed5badb5c4c53 --- vp8/decoder/decodframe.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c index 67c6500..2f0af29 100644 --- a/vp8/decoder/decodframe.c +++ b/vp8/decoder/decodframe.c @@ -888,9 +888,8 @@ static void read_coef_probs(VP8D_COMP *pbi, BOOL_DECODER* const bc) { VP8_COMMON *const pc = &pbi->common; read_coef_probs_common(bc, pc->fc.coef_probs); -#if CONFIG_HYBRIDTRANSFORM read_coef_probs_common(bc, pc->fc.hybrid_coef_probs); -#endif + if (pbi->common.txfm_mode != ONLY_4X4) { read_coef_probs_common(bc, pc->fc.coef_probs_8x8); read_coef_probs_common(bc, pc->fc.hybrid_coef_probs_8x8); -- 2.7.4