Merge remote branch 'origin/master' into experimental

Change-Id: I473166452c0ed5a4219b5e7d96a91a6641b11b9d

diff --cc vp8/vp8_cx_iface.c
index 8394c8e0528a3854e5250fe13e1e9c299f350574,ca4e505dcae51101c256587df1e2916ba6b4ecac..9f703a3c409613c37824a851e31c83eae1376b11
--- 1/vp8/vp8_cx_iface.c
--- 2/vp8/vp8_cx_iface.c
+++ b/vp8/vp8_cx_iface.c
@@@ -37,9 -37,9 +37,10 @@@ struct vp8_extracf
      unsigned int                arnr_max_frames;    /* alt_ref Noise Reduction Max Frame Count */
      unsigned int                arnr_strength;    /* alt_ref Noise Reduction Strength */
      unsigned int                arnr_type;        /* alt_ref filter type */
 +    unsigned int                experimental;
      vp8e_tuning                 tuning;
      unsigned int                cq_level;         /* constrained quality level */
+     unsigned int                rc_max_intra_bitrate_pct;
  
  };
  
@@@ -70,9 -70,9 +71,10 @@@ static const struct extraconfig_map ext
              0,                          /* arnr_max_frames */
              3,                          /* arnr_strength */
              3,                          /* arnr_type*/
 +            0,                          /* experimental mode */
              0,                          /* tuning*/
              10,                         /* cq_level */
+             0,                          /* rc_max_intra_bitrate_pct */
          }
      }
  };

diff --cc vpx/vp8cx.h
Simple merge