Merge remote branch 'origin/master' into experimental

Change-Id: Ib34bc09a295141eb65c8c0478bde6136f178909b

diff --cc vp8/vp8_cx_iface.c
index a833ea5cfb7a17e56220e20e64d264f9af51281e,4c7aca520d7a105c25afeb5971cf0fbe7e895760..09a9151bc03be9bf14cabaaa97919c21649fc12a
--- 1/vp8/vp8_cx_iface.c
--- 2/vp8/vp8_cx_iface.c
+++ b/vp8/vp8_cx_iface.c
@@@ -37,8 -37,8 +37,9 @@@ 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 */
  
  };
  
@@@ -69,8 -69,8 +70,9 @@@ static const struct extraconfig_map ext
              0,                          /* arnr_max_frames */
              3,                          /* arnr_strength */
              3,                          /* arnr_type*/
 +            0,                          /* experimental mode */
              0,                          /* tuning*/
+             10,                         /* cq_level */
          }
      }
  };

diff --cc vpx/vp8cx.h
Simple merge