diff options
| author | Yaowu Xu <yaowu@google.com> | 2014-03-31 07:08:40 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-03-31 07:08:40 -0700 |
| commit | 6618b73b5e0eac51df9997b6bc78b76c70fff2dc (patch) | |
| tree | 2f33000556dc5731f4a21fb46ddf242ddfb0ce6b /vp9/common/vp9_scale.c | |
| parent | 8a099deb60d17d7dd7729398e2194e40c6b4ec45 (diff) | |
| parent | 4f857bacd22ea4e95c0bd8a0de3da3dcd017eff3 (diff) | |
| download | libvpx-6618b73b5e0eac51df9997b6bc78b76c70fff2dc.tar libvpx-6618b73b5e0eac51df9997b6bc78b76c70fff2dc.tar.gz libvpx-6618b73b5e0eac51df9997b6bc78b76c70fff2dc.tar.bz2 libvpx-6618b73b5e0eac51df9997b6bc78b76c70fff2dc.zip | |
Merge "[BITSTREAM]Fix the scaling calculation"
Diffstat (limited to 'vp9/common/vp9_scale.c')
| -rw-r--r-- | vp9/common/vp9_scale.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/common/vp9_scale.c b/vp9/common/vp9_scale.c index e0f1e3410..d3405fcdb 100644 --- a/vp9/common/vp9_scale.c +++ b/vp9/common/vp9_scale.c @@ -13,11 +13,11 @@ #include "vp9/common/vp9_scale.h" static INLINE int scaled_x(int val, const struct scale_factors *sf) { - return val * sf->x_scale_fp >> REF_SCALE_SHIFT; + return (int)((int64_t)val * sf->x_scale_fp >> REF_SCALE_SHIFT); } static INLINE int scaled_y(int val, const struct scale_factors *sf) { - return val * sf->y_scale_fp >> REF_SCALE_SHIFT; + return (int)((int64_t)val * sf->y_scale_fp >> REF_SCALE_SHIFT); } static int unscaled_value(int val, const struct scale_factors *sf) { |