Merge "Fix to resize logic for 1 pass mode."

diff --cc vp9/encoder/vp9_encoder.c
Simple merge

diff --cc vp9/encoder/vp9_ratectrl.c
index 9c714fb,a6ad9ae..8c6c633
--- 1/vp9/encoder/vp9_ratectrl.c
--- 2/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@@ -1825,8 -1826,9 +1827,9 @@@ int vp9_resize_one_pass_cbr(VP9_COMP *c
        // Resize back up if average QP is low, and we are currently in a resized
        // down state.
        if (cpi->resize_state == 0 &&
 -          cpi->resize_buffer_underflow > (cpi->resize_count >> 3)) {
 +          cpi->resize_buffer_underflow > (cpi->resize_count >> 2)) {
          resize_now = 1;
+         cpi->resize_state = 1;
        } else if (cpi->resize_state == 1 &&
                   avg_qp < 40 * cpi->rc.worst_quality / 100) {
          resize_now = -1;