Fix bad merge of coef_probs update
authorJohn Koleszar <jkoleszar@google.com>
Wed, 24 Oct 2012 19:59:22 +0000 (12:59 -0700)
committerJohn Koleszar <jkoleszar@google.com>
Wed, 24 Oct 2012 19:59:22 +0000 (12:59 -0700)
commit45b4832ffdadaadf2afe9ad33500dfbce7a6c3a9
tree52115f847bba4ab2d535085b15863af7d65f246b
parent226e55c17d6f732911c1b9282c6dfc334496204d
Fix bad merge of coef_probs update

Stray CONFIG_HYBRIDTRANSFORM caused decode mismatch.

Change-Id: I1d77bad9b366f7a6ceb3cb45269ed5badb5c4c53
vp8/decoder/decodframe.c