ref: b13d1c307e721e6475cfda83182b7e4aa5b49c3c
parent: 0867b8167899b9df7a0b40bbc416abd359ac0ac8
parent: ed5ab7fa495e1ea030359c316df8b605e61219e0
author: John Koleszar <jkoleszar@google.com>
date: Sat Nov 20 19:05:05 EST 2010
Merge remote branch 'origin/master' into experimental
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -5362,12 +5362,12 @@
{VP8_COMP *cpi = (VP8_COMP *) comp;
- if (horiz_mode >= NORMAL && horiz_mode <= ONETWO)
+ if (horiz_mode <= ONETWO)
cpi->common.horiz_scale = horiz_mode;
else
return -1;
- if (vert_mode >= NORMAL && vert_mode <= ONETWO)
+ if (vert_mode <= ONETWO)
cpi->common.vert_scale = vert_mode;
else
return -1;