diff options
| author | James Zern <jzern@google.com> | 2016-09-19 18:32:12 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2016-09-19 18:35:59 -0700 |
| commit | 0ce98b423b07c719b10053a2f76ce69d957fdc3c (patch) | |
| tree | 206d156a60107102966de2e84c3fb04d1a5a82ee | |
| parent | 0695843a216dd63e8ac087e13c44de81e8a50afe (diff) | |
| download | libvpx-0ce98b423b07c719b10053a2f76ce69d957fdc3c.tar libvpx-0ce98b423b07c719b10053a2f76ce69d957fdc3c.tar.gz libvpx-0ce98b423b07c719b10053a2f76ce69d957fdc3c.tar.bz2 libvpx-0ce98b423b07c719b10053a2f76ce69d957fdc3c.zip | |
vp8/encoder: quiet some -Wshorten-64-to-32 warnings
this code is similar to other existing uses and/or vp9
Change-Id: I56e646931379759d9f7332ea6d746060007c75ee
| -rw-r--r-- | vp8/encoder/onyx_if.c | 2 | ||||
| -rw-r--r-- | vp8/encoder/pickinter.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index f61cfbe90..36d892716 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -4384,7 +4384,7 @@ static void encode_frame_to_data_rate(VP8_COMP *cpi, unsigned long *size, /* Update rate control heuristics */ cpi->total_byte_count += (*size); - cpi->projected_frame_size = (*size) << 3; + cpi->projected_frame_size = (int)(*size) << 3; if (cpi->oxcf.number_of_layers > 1) { unsigned int i; diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c index f0050d201..7b68d35f5 100644 --- a/vp8/encoder/pickinter.c +++ b/vp8/encoder/pickinter.c @@ -570,7 +570,7 @@ static int evaluate_inter_mode(unsigned int *sse, int rate2, int *distortion2, // No adjustment if block is considered to be skin area. if (x->is_skin) rd_adj = 100; - this_rd = ((int64_t)this_rd) * rd_adj / 100; + this_rd = (int)(((int64_t)this_rd) * rd_adj / 100); } check_for_encode_breakout(*sse, x); |