Merge remote branch 'origin/master' into experimental

Conflicts:
	vp8/vp8_cx_iface.c

Change-Id: I76f302448f11b28772efd4b5643f86a7cc69a8c2

diff --cc vp8/vp8_cx_iface.c
index edadd73e33e33fa12512893594e8cbc4a36583e9,f9592077553ca839ae30ab12c381975832680eb7..a833ea5cfb7a17e56220e20e64d264f9af51281e
--- 1/vp8/vp8_cx_iface.c
--- 2/vp8/vp8_cx_iface.c
+++ b/vp8/vp8_cx_iface.c
@@@ -37,7 -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;
+ 
  };
  
  struct extraconfig_map
@@@ -67,7 -68,7 +69,8 @@@ static const struct extraconfig_map ext
              0,                          /* arnr_max_frames */
              3,                          /* arnr_strength */
              3,                          /* arnr_type*/
 +            0,                          /* experimental mode */
+             0,                          /* tuning*/
          }
      }
  };

diff --cc vpx/vp8cx.h
Simple merge