shithub: libvpx

Info  •  Files  •  Log  •  Branches

Fix bad merge of coef_probs update

Stray CONFIG_HYBRIDTRANSFORM caused decode mismatch.

Change-Id: I1d77bad9b366f7a6ceb3cb45269ed5badb5c4c53

--- a/vp8/decoder/decodframe.c

+++ b/vp8/decoder/decodframe.c

@@ -888,9 +888,8 @@

   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);

-- 

⑨