Merge remote branch 'origin/master' into experimental
This commit is contained in:
commit
b13d1c307e
@ -5362,12 +5362,12 @@ int vp8_set_internal_size(VP8_PTR comp, VPX_SCALING horiz_mode, VPX_SCALING vert
|
|||||||
{
|
{
|
||||||
VP8_COMP *cpi = (VP8_COMP *) comp;
|
VP8_COMP *cpi = (VP8_COMP *) comp;
|
||||||
|
|
||||||
if (horiz_mode >= NORMAL && horiz_mode <= ONETWO)
|
if (horiz_mode <= ONETWO)
|
||||||
cpi->common.horiz_scale = horiz_mode;
|
cpi->common.horiz_scale = horiz_mode;
|
||||||
else
|
else
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
if (vert_mode >= NORMAL && vert_mode <= ONETWO)
|
if (vert_mode <= ONETWO)
|
||||||
cpi->common.vert_scale = vert_mode;
|
cpi->common.vert_scale = vert_mode;
|
||||||
else
|
else
|
||||||
return -1;
|
return -1;
|
||||||
|
Loading…
Reference in New Issue
Block a user