commit e6657f32c56aa3e6e30a05590b4a247efd12aaef
author Marco Paniconi <marpan@google.com> Wed Apr 13 22:36:28 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 13 22:36:29 2016 +0000
tree 3a41903040c24007e3121cdc32ab2dbc6a2ac488
parent 885872f8995fa7dfe7962ae1dfa357af29ac547f
parent 24db57f0e14e5e6cc9022a33f4e23b84e027a1a5

Merge "vp9: Adjustment to scene-cut detection."

vp9/encoder/vp9_ratectrl.c

diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c
index 076163d..dab7f67 100644
--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -835,8 +835,8 @@
   int active_cq_level = oxcf->cq_level;
   if (oxcf->rc_mode == VPX_CQ) {
     if (twopass->mb_smooth_pct > SMOOTH_PCT_MIN) {
-      active_cq_level -= (twopass->mb_smooth_pct - SMOOTH_PCT_MIN) /
-          SMOOTH_PCT_DIV;
+      active_cq_level -= (int)((twopass->mb_smooth_pct - SMOOTH_PCT_MIN) /
+          SMOOTH_PCT_DIV);
       active_cq_level = VPXMAX(active_cq_level, 0);
     }
     if (rc->total_target_bits > 0) {