ref: 006247ac332159c107ed2db7065b0b7c7839fa46
parent: 1a1a8ea4df761f13c254cf021ff5d6510f42d95b
parent: ed5ab7fa495e1ea030359c316df8b605e61219e0
author: John Koleszar <jkoleszar@google.com>
date: Sat Nov 20 19:05:06 EST 2010
Merge remote branch 'internal/upstream' into HEAD
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -5361,12 +5361,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;