Merge remote branch 'origin/master' into experimental

Conflicts:
	configure
	ivfenc.c
	vp8/common/alloccommon.c
	vp8/common/onyxc_int.h
	vp8/vp8_cx_iface.c

diff --cc configure
index 8fa56fe,11e086e..ab86fa0
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -244,9 -247,9 +249,12 @@@ CONFIG_LIST=
      static_msvcrt
      spatial_resampling
      realtime_only
+     shared
+     small
+     arm_asm_detok
 +
 +    experimental
 +    ${EXPERIMENT_LIST}
  "
  CMDLINE_SELECT="
      extra_warnings
@@@ -285,7 -286,9 +291,10 @@@
      mem_tracker
      spatial_resampling
      realtime_only
 +    experimental
+     shared
+     small
+     arm_asm_detok
  "
  
  process_cmdline() {

diff --cc vp8/common/alloccommon.c
Simple merge

diff --cc vp8/common/onyxc_int.h
index 94632da,7e44c1f..f60b0f3
--- 1/vp8/common/onyxc_int.h
--- 2/vp8/common/onyxc_int.h
+++ b/vp8/common/onyxc_int.h
@@@ -112,8 -116,7 +116,8 @@@ typedef struct VP8Commo
      int mb_cols;
      int mode_info_stride;
  
-     // prfile settings
+     /* profile settings */
 +    int experimental;
      int mb_no_coeff_skip;
      int no_lpf;
      int simpler_lpf;

diff --cc vp8/vp8_cx_iface.c
index 32c5f3b,8e50b7f..4f780a3
--- 1/vp8/vp8_cx_iface.c
--- 2/vp8/vp8_cx_iface.c
+++ b/vp8/vp8_cx_iface.c
@@@ -60,12 -62,11 +62,12 @@@ static const struct extraconfig_map ext
              0,                          /* enable_auto_alt_ref */
              0,                          /* noise_sensitivity */
              0,                          /* Sharpness */
-             800,                        /* static_thresh */
+             0,                          /* static_thresh */
              VP8_ONE_TOKENPARTITION,     /* token_partitions */
-             0, /* arnr_max_frames */
-             0, /* arnr_strength */
-             0, /* arnr_type*/
+             0,                          /* arnr_max_frames */
+             3,                          /* arnr_strength */
+             3,                          /* arnr_type*/
 +            0,                          /* experimental mode */
          }
      }
  };

diff --cc vpx/vp8cx.h
index 6a8cf65,efd7945..5ab6fbf
--- 1/vpx/vp8cx.h
--- 2/vpx/vp8cx.h
+++ b/vpx/vp8cx.h
@@@ -28,19 -29,10 +29,20 @@@
   * This interface provides the capability to encode raw VP8 streams, as would
   * be found in AVI files.
   */
- extern vpx_codec_iface_t vpx_codec_vp8_cx_algo;
+ extern vpx_codec_iface_t  vpx_codec_vp8_cx_algo;
+ extern vpx_codec_iface_t* vpx_codec_vp8_cx(void);
  
  
 +#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
   */