diff options
| author | Tom Finegan <tomfinegan@google.com> | 2014-05-22 15:16:01 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-05-22 15:16:01 -0700 |
| commit | 00fbdc159b1ac4896a57a8ef5665a24df4a06e19 (patch) | |
| tree | 71b94eecf2be1f61eeb10ba1fedbceb5a316fd39 /vp9/encoder/vp9_ratectrl.c | |
| parent | 639e16ee00e37dab9f73830a349603c17f97ac8b (diff) | |
| parent | 4205b51d512cd789d4d39bc43edfa47c66ef0ccd (diff) | |
| download | libvpx-00fbdc159b1ac4896a57a8ef5665a24df4a06e19.tar libvpx-00fbdc159b1ac4896a57a8ef5665a24df4a06e19.tar.gz libvpx-00fbdc159b1ac4896a57a8ef5665a24df4a06e19.tar.bz2 libvpx-00fbdc159b1ac4896a57a8ef5665a24df4a06e19.zip | |
Merge "vp9_ratectrl.c: Fix MSVC warnings."
Diffstat (limited to 'vp9/encoder/vp9_ratectrl.c')
| -rw-r--r-- | vp9/encoder/vp9_ratectrl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c index af889e366..b57e3897e 100644 --- a/vp9/encoder/vp9_ratectrl.c +++ b/vp9/encoder/vp9_ratectrl.c @@ -612,9 +612,9 @@ static int get_active_cq_level(const RATE_CONTROL *rc, static const double cq_adjust_threshold = 0.5; int active_cq_level = oxcf->cq_level; if (oxcf->rc_mode == RC_MODE_CONSTRAINED_QUALITY) { - const double x = rc->total_actual_bits / rc->total_target_bits; + const double x = (double)rc->total_actual_bits / rc->total_target_bits; if (x < cq_adjust_threshold) { - active_cq_level = active_cq_level * x / cq_adjust_threshold; + active_cq_level = (int)(active_cq_level * x / cq_adjust_threshold); } } return active_cq_level; |