diff options
| author | Deb Mukherjee <debargha@google.com> | 2014-10-03 00:09:41 -0700 |
|---|---|---|
| committer | Deb Mukherjee <debargha@google.com> | 2014-10-03 00:09:41 -0700 |
| commit | 00a4b20fbecc1137ff9a0421d51f4131013bb70a (patch) | |
| tree | 8c056a82a832ee0ef9c50dbfd9566a6020bb6ba7 | |
| parent | ba172ff0a587d8f47587c478b368c1ea33829a79 (diff) | |
| download | libvpx-00a4b20fbecc1137ff9a0421d51f4131013bb70a.tar libvpx-00a4b20fbecc1137ff9a0421d51f4131013bb70a.tar.gz libvpx-00a4b20fbecc1137ff9a0421d51f4131013bb70a.tar.bz2 libvpx-00a4b20fbecc1137ff9a0421d51f4131013bb70a.zip | |
rdmult data type change
To fix a VS warning.
Change-Id: I4c530c0afe8d06acdb8cc78b7995aba57a25373d
| -rw-r--r-- | vp9/encoder/vp9_rd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_rd.c b/vp9/encoder/vp9_rd.c index efb8686dd..75c396433 100644 --- a/vp9/encoder/vp9_rd.c +++ b/vp9/encoder/vp9_rd.c @@ -138,7 +138,7 @@ static const int rd_frame_type_factor[FRAME_UPDATE_TYPES] = { int vp9_compute_rd_mult(const VP9_COMP *cpi, int qindex) { const int64_t q = vp9_dc_quant(qindex, 0, cpi->common.bit_depth); #if CONFIG_VP9_HIGHBITDEPTH - int rdmult = 0; + int64_t rdmult = 0; switch (cpi->common.bit_depth) { case VPX_BITS_8: rdmult = 88 * q * q / 24; @@ -154,7 +154,7 @@ int vp9_compute_rd_mult(const VP9_COMP *cpi, int qindex) { return -1; } #else - int rdmult = 88 * q * q / 24; + int64_t rdmult = 88 * q * q / 24; #endif // CONFIG_VP9_HIGHBITDEPTH if (cpi->oxcf.pass == 2 && (cpi->common.frame_type != KEY_FRAME)) { const GF_GROUP *const gf_group = &cpi->twopass.gf_group; @@ -164,7 +164,7 @@ int vp9_compute_rd_mult(const VP9_COMP *cpi, int qindex) { rdmult = (rdmult * rd_frame_type_factor[frame_type]) >> 7; rdmult += ((rdmult * rd_boost_factor[boost_index]) >> 7); } - return rdmult; + return (int)rdmult; } static int compute_rd_thresh_factor(int qindex, vpx_bit_depth_t bit_depth) { |