diff options
| author | John Koleszar <jkoleszar@google.com> | 2010-11-21 00:05:06 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2010-11-21 00:05:06 -0500 |
| commit | 006247ac332159c107ed2db7065b0b7c7839fa46 (patch) | |
| tree | 4b09af3a80035dac20b159eb29113194b2079ab2 /vp8/encoder | |
| parent | 1a1a8ea4df761f13c254cf021ff5d6510f42d95b (diff) | |
| parent | ed5ab7fa495e1ea030359c316df8b605e61219e0 (diff) | |
| download | libvpx-006247ac332159c107ed2db7065b0b7c7839fa46.tar libvpx-006247ac332159c107ed2db7065b0b7c7839fa46.tar.gz libvpx-006247ac332159c107ed2db7065b0b7c7839fa46.tar.bz2 libvpx-006247ac332159c107ed2db7065b0b7c7839fa46.zip | |
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'vp8/encoder')
| -rw-r--r-- | vp8/encoder/onyx_if.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 57071fb3a..e2e62d52b 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -5361,12 +5361,12 @@ int vp8_set_internal_size(VP8_PTR comp, VPX_SCALING horiz_mode, VPX_SCALING vert { 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; |