Merge "Change rc undershoot/overshoot semantics"

diff --cc vp8/common/onyx.h
Simple merge

diff --cc vp8/encoder/ratectrl.c
index 2c1051f,767b271..8e8854a
--- 1/vp8/encoder/ratectrl.c
--- 2/vp8/encoder/ratectrl.c
+++ b/vp8/encoder/ratectrl.c
@@@ -1538,8 -1538,7 +1537,8 @@@ void vp8_adjust_key_frame_context(VP8_C
      cpi->key_frame_count++;
  }
  
- 
+ void vp8_compute_frame_size_bounds(VP8_COMP *cpi, int *frame_under_shoot_limit, int *frame_over_shoot_limit)
 +void vp8_compute_frame_size_bounds(VP8_COMP *cpi, int *frame_under_shoot_limit, int *frame_over_shoot_limit)
  {
      // Set-up bounds on acceptable frame size:
      if (cpi->oxcf.fixed_q >= 0)

diff --cc vp8/vp8_cx_iface.c
index 17eb6a2,6b13033..db60bfe
--- 1/vp8/vp8_cx_iface.c
--- 2/vp8/vp8_cx_iface.c
+++ b/vp8/vp8_cx_iface.c
@@@ -1084,11 -1090,11 +1086,11 @@@ static vpx_codec_enc_cfg_map_t vp8e_usa
          {0},                /* rc_twopass_stats_in */
  #endif
          256,                /* rc_target_bandwidth */
 -
 +        0,                  /* rc_max_intra_bitrate_pct */
          4,                  /* rc_min_quantizer */
          63,                 /* rc_max_quantizer */
-         95,                 /* rc_undershoot_pct */
-         200,                /* rc_overshoot_pct */
+         100,                /* rc_undershoot_pct */
+         100,                /* rc_overshoot_pct */
  
          6000,               /* rc_max_buffer_size */
          4000,               /* rc_buffer_initial_size; */

diff --cc vpx/vpx_encoder.h
Simple merge