Merge "Fix rate allocation bug."

diff --cc vp9/encoder/vp9_firstpass.c
index 3e0b617f91eb92adbce516ec4e14ac1c25a2af62,910aae94ed95a6bd5d4062713aff364a25aad89d..5317661c08ac2120ef1c09b5279d496c03faf898
--- 1/vp9/encoder/vp9_firstpass.c
--- 2/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@@ -1663,10 -1664,10 +1662,10 @@@ static void define_gf_group(VP9_COMP *c
  
    // Don't allow a gf too near the next kf
    if ((cpi->rc.frames_to_key - i) < MIN_GF_INTERVAL) {
-     while (i < (cpi->rc.frames_to_key - 1)) {
+     while (i < cpi->rc.frames_to_key) {
        i++;
  
 -      if (EOF == input_stats(cpi, this_frame))
 +      if (EOF == input_stats(&cpi->twopass, this_frame))
          break;
  
        if (i < cpi->rc.frames_to_key) {