Merge remote branch 'internal/upstream' into HEAD

Conflicts:
	vp8/common/alloccommon.c
	vp8/common/onyxc_int.h
	vp8/vp8_cx_iface.c
	vpxenc.c

diff --cc configure
Simple merge

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

diff --cc vp8/common/onyxc_int.h
index d91e1f1,7e44c1f..f60b0f3
--- 1/vp8/common/onyxc_int.h
--- 2/vp8/common/onyxc_int.h
+++ b/vp8/common/onyxc_int.h
@@@ -115,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 cf2b1ff,8e50b7f..4f780a3
--- 1/vp8/vp8_cx_iface.c
--- 2/vp8/vp8_cx_iface.c
+++ b/vp8/vp8_cx_iface.c
@@@ -63,10 -64,9 +64,10 @@@ static const struct extraconfig_map ext
              0,                          /* Sharpness */
              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 vpxenc.c
Simple merge