diff options
| author | Yaowu Xu <yaowu@google.com> | 2014-01-13 18:04:30 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-01-13 18:04:30 -0800 |
| commit | 4f2a80f05fdd4bfb75c61483498d09fc8f1eb075 (patch) | |
| tree | 2d6033703965a9ae4d04f40469ad2ca2fafbed03 /vp9/encoder | |
| parent | dd31f2e4ae480f074841e0653dff91ccda9df091 (diff) | |
| parent | 31d3f43e1891b514ce10be49807deea017cd2830 (diff) | |
| download | libvpx-4f2a80f05fdd4bfb75c61483498d09fc8f1eb075.tar libvpx-4f2a80f05fdd4bfb75c61483498d09fc8f1eb075.tar.gz libvpx-4f2a80f05fdd4bfb75c61483498d09fc8f1eb075.tar.bz2 libvpx-4f2a80f05fdd4bfb75c61483498d09fc8f1eb075.zip | |
Merge "fix a div by zero issue"
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_firstpass.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index 812ffa96d..7c4ca6378 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -1825,7 +1825,8 @@ static void define_gf_group(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) { // If the frame that is to be boosted is simpler than the average for // the gf/arf group then use an alternative calculation // based on the error score of the frame itself - if (mod_frame_err < gf_group_err / (double)cpi->rc.baseline_gf_interval) { + if (cpi->rc.baseline_gf_interval < 1 || + mod_frame_err < gf_group_err / (double)cpi->rc.baseline_gf_interval) { double alt_gf_grp_bits = (double)cpi->twopass.kf_group_bits * (mod_frame_err * (double)cpi->rc.baseline_gf_interval) / |