diff options
author | Frank Galligan <fgalligan@google.com> | 2014-05-08 08:49:04 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-05-08 08:49:04 -0700 |
commit | aa3d59fcf9867b00ae7f93219aebd29c9631ce8c (patch) | |
tree | 069ebfdfd8f7f70aa96b45b2f98a15e4144a1fa3 /vp9/encoder | |
parent | b391b62a7ed1cbe231421eccb2ab55187e2ff12a (diff) | |
parent | 7811039d476f22276201523b1c8ce8b38824f264 (diff) | |
download | libvpx-aa3d59fcf9867b00ae7f93219aebd29c9631ce8c.tar libvpx-aa3d59fcf9867b00ae7f93219aebd29c9631ce8c.tar.gz libvpx-aa3d59fcf9867b00ae7f93219aebd29c9631ce8c.tar.bz2 libvpx-aa3d59fcf9867b00ae7f93219aebd29c9631ce8c.zip |
Merge "vp9_firstpass: Fix MSVC data loss warning."
Diffstat (limited to 'vp9/encoder')
-rw-r--r-- | vp9/encoder/vp9_firstpass.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index 5867fb3fc..efa320f3f 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -2402,8 +2402,8 @@ void vp9_twopass_postencode_update(VP9_COMP *cpi) { const double progress = (double)(cpi->twopass.stats_in - cpi->twopass.stats_in_start) / (cpi->twopass.stats_in_end - cpi->twopass.stats_in_start); - const int bits_used = progress * rc->this_frame_target + - (1.0 - progress) * rc->projected_frame_size; + const int bits_used = (int)(progress * rc->this_frame_target + + (1.0 - progress) * rc->projected_frame_size); #endif cpi->twopass.bits_left -= bits_used; |