diff options
author | Adrian Grange <agrange@google.com> | 2013-04-17 10:12:15 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-04-17 10:12:15 -0700 |
commit | cbd6eaa9241ff18160e06a64023ae4802cac8c0c (patch) | |
tree | fa54fc32fbe5ba1be95f886d82344ac6893f7818 /vp9/encoder/vp9_firstpass.c | |
parent | 90a91cc683a8c52443de8a6720875712978a492e (diff) | |
parent | 82bbb230103ce9c1d1f5175b077a33ae45a13400 (diff) | |
download | libvpx-cbd6eaa9241ff18160e06a64023ae4802cac8c0c.tar libvpx-cbd6eaa9241ff18160e06a64023ae4802cac8c0c.tar.gz libvpx-cbd6eaa9241ff18160e06a64023ae4802cac8c0c.tar.bz2 libvpx-cbd6eaa9241ff18160e06a64023ae4802cac8c0c.zip |
Merge "Fixed overflow test on boost calculation" into experimental
Diffstat (limited to 'vp9/encoder/vp9_firstpass.c')
-rw-r--r-- | vp9/encoder/vp9_firstpass.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index 8ddcc9da7..cda3b5d6d 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -1963,7 +1963,7 @@ static void define_gf_group(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) { (cpi->baseline_gf_interval * 100) + (boost - 100); // Prevent overflow - if (boost > 1028) { // TODO(agrange) Should this be 1024? + if (boost > 1023) { int divisor = boost >> 10; boost /= divisor; allocation_chunks /= divisor; |