diff options
author | Yaowu Xu <yaowu@google.com> | 2015-06-19 19:02:09 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-06-19 19:02:15 +0000 |
commit | e5d4062962c0b8f844590ae6a3bf32d939ffc656 (patch) | |
tree | efaef8c2f3c07f82b639c0fd25fd81b05cf98fa3 | |
parent | 001baa5dd8bce66707a123de687a38c4da45cf9a (diff) | |
parent | d8428ae35da4e90a5fc799c4ad07779946664f0d (diff) | |
download | libvpx-e5d4062962c0b8f844590ae6a3bf32d939ffc656.tar libvpx-e5d4062962c0b8f844590ae6a3bf32d939ffc656.tar.gz libvpx-e5d4062962c0b8f844590ae6a3bf32d939ffc656.tar.bz2 libvpx-e5d4062962c0b8f844590ae6a3bf32d939ffc656.zip |
Merge "Fix a msvc compiler warning"
-rw-r--r-- | vp9/encoder/vp9_ratectrl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c index 158581b81..425073fcd 100644 --- a/vp9/encoder/vp9_ratectrl.c +++ b/vp9/encoder/vp9_ratectrl.c @@ -1775,7 +1775,7 @@ int vp9_resize_one_pass_cbr(VP9_COMP *cpi) { // Resize based on average QP over some window. // Ignore samples close to key frame, since QP is usually high after key. if (cpi->rc.frames_since_key > 2 * cpi->framerate) { - const int window = 5 * cpi->framerate; + const int window = (int)(5 * cpi->framerate); cpi->resize_avg_qp += cm->base_qindex; if (cpi->rc.buffer_level < 0) ++cpi->resize_buffer_underflow; |