Merge remote branch 'origin/master' into experimental

Change-Id: I70ac5a4f8388a7bfa058178c0ae53f6bdb0bb6e5

diff --cc vp8/encoder/firstpass.c
Simple merge

diff --cc vp8/encoder/onyx_if.c
Simple merge

diff --cc vp8/vp8_cx_iface.c
Simple merge

diff --cc vpx/vp8cx.h
index 5da4fe2,5ff6bdc..f024fce
--- 1/vpx/vp8cx.h
--- 2/vpx/vp8cx.h
+++ b/vpx/vp8cx.h
@@@ -31,18 -32,9 +32,19 @@@
   */
  extern vpx_codec_iface_t  vpx_codec_vp8_cx_algo;
  extern vpx_codec_iface_t* vpx_codec_vp8_cx(void);
+ /*!@} - end algorithm interface member group*/
  
  
 +#if CONFIG_EXPERIMENTAL
 +/*!\brief Algorithm interface for VP8 experimental branch
 + *
 + * This interface provides the ability to encode using the "experimental"
 + * VP8 variant, which is bitstream incompatible with the default VP8 encoder.
 + */
 +extern vpx_codec_iface_t vpx_codec_vp8x_cx_algo;
 +#endif
 +
 +
  /*
   * Algorithm Flags
   */