From: John Koleszar <jkoleszar@google.com>
Date: Wed, 24 Oct 2012 19:59:22 +0000 (-0700)
Subject: Fix bad merge of coef_probs update
X-Git-Tag: v1.3.0~1217^2~187
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=45b4832ffdadaadf2afe9ad33500dfbce7a6c3a9;p=libvpx

Fix bad merge of coef_probs update

Stray CONFIG_HYBRIDTRANSFORM caused decode mismatch.

Change-Id: I1d77bad9b366f7a6ceb3cb45269ed5badb5c4c53
---

diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c
index 67c650091..2f0af2925 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);