diff options
| author | James Zern <jzern@google.com> | 2014-10-09 03:53:01 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-10-09 03:53:01 -0700 |
| commit | 924af1edd883ab97fb004a9044f38695f9c460ca (patch) | |
| tree | fc4c88dd71e9c6cf2b69954eb277501c59237efa /vp9 | |
| parent | caa0f81914cea8121aab8fff49449c6bbd344394 (diff) | |
| parent | cec763bd97fbcd5df42ba58a293b3136708a397e (diff) | |
| download | libvpx-924af1edd883ab97fb004a9044f38695f9c460ca.tar libvpx-924af1edd883ab97fb004a9044f38695f9c460ca.tar.gz libvpx-924af1edd883ab97fb004a9044f38695f9c460ca.tar.bz2 libvpx-924af1edd883ab97fb004a9044f38695f9c460ca.zip | |
Merge "set_vt_partitioning: fix type conversion warning"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index fed1654e0..491c7d6ff 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -396,9 +396,10 @@ static int set_vt_partitioning(VP9_COMP *cpi, const int block_width = num_8x8_blocks_wide_lookup[bsize]; const int block_height = num_8x8_blocks_high_lookup[bsize]; // TODO(debargha): Choose this more intelligently. - const int64_t threshold_multiplier = cm->frame_type == KEY_FRAME ? 64 : 4; - int64_t threshold = threshold_multiplier * - vp9_convert_qindex_to_q(cm->base_qindex, cm->bit_depth); + const int threshold_multiplier = cm->frame_type == KEY_FRAME ? 64 : 4; + int64_t threshold = + (int64_t)(threshold_multiplier * + vp9_convert_qindex_to_q(cm->base_qindex, cm->bit_depth)); assert(block_height == block_width); tree_to_node(data, bsize, &vt); |