summaryrefslogtreecommitdiff
path: root/vp9
diff options
context:
space:
mode:
authorYaowu Xu <yaowu@google.com>2014-01-24 16:05:13 -0800
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2014-01-24 16:05:13 -0800
commit7adfa9f4cb7341f1bdddad23946d216c107a0751 (patch)
treeeca94b8afc8e719c7ec2889146a85bded4d6eb42 /vp9
parent03eb63c1148be2c7267a8a01796dce700fe22fb7 (diff)
parent8971338c6bb0ff3aeaa315d9f049611513c30141 (diff)
downloadlibvpx-7adfa9f4cb7341f1bdddad23946d216c107a0751.tar
libvpx-7adfa9f4cb7341f1bdddad23946d216c107a0751.tar.gz
libvpx-7adfa9f4cb7341f1bdddad23946d216c107a0751.tar.bz2
libvpx-7adfa9f4cb7341f1bdddad23946d216c107a0751.zip
Merge "change to avoid IOC"
Diffstat (limited to 'vp9')
-rw-r--r--vp9/encoder/vp9_rdopt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index 5f2f8a819..b7ea34679 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -428,7 +428,7 @@ static void model_rd_for_sb(VP9_COMP *cpi, BLOCK_SIZE bsize,
}
*out_rate_sum = rate_sum;
- *out_dist_sum = dist_sum << 4;
+ *out_dist_sum = (int64_t)dist_sum << 4;
}
static void model_rd_for_sb_y_tx(VP9_COMP *cpi, BLOCK_SIZE bsize,