Merge remote branch 'origin/master' into experimental

Conflicts:
	vp8/common/alloccommon.c
	vp8/encoder/rdopt.c

Change-Id: I142167d31d1b9cffe143774f6915bca463df67f0

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

diff --cc vp8/common/onyxc_int.h
index a91cb337b11e6af4bff08f405fbcecf1b7d504c5,03aed81cbd5f644e751664c8adc74038f8742217..e67d39cbb9bc8824faea2818a23d9ec5a4f16e80
--- 1/vp8/common/onyxc_int.h
--- 2/vp8/common/onyxc_int.h
+++ b/vp8/common/onyxc_int.h
@@@ -117,10 -117,8 +117,9 @@@ typedef struct VP8Commo
      int mode_info_stride;
  
      /* profile settings */
 +    int experimental;
      int mb_no_coeff_skip;
      int no_lpf;
-     int simpler_lpf;
      int use_bilinear_mc_filter;
      int full_pixel;
  

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

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

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

diff --cc vp8/encoder/rdopt.c
index 54cfab8c54694b648166ec4dc834ec91cd3560fa,e99d6f0d11c4918cfb92052fbf099c0152a40a13..dfc9bec950ae85f431eac3d859ac1604249e183f
--- 1/vp8/encoder/rdopt.c
--- 2/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@@ -292,16 -241,9 +292,13 @@@ void vp8_initialize_rd_consts(VP8_COMP 
      cpi->mb.errorperbit = (cpi->RDMULT / 100);
      cpi->mb.errorperbit += (cpi->mb.errorperbit==0);
  
 +#if CONFIG_EXTEND_QRANGE
 +    if(cpi->mb.errorperbit<1)
 +        cpi->mb.errorperbit=1;
 +#endif
      vp8_set_speed_features(cpi);
  
-     if (cpi->common.simpler_lpf)
-         cpi->common.filter_type = SIMPLE_LOOPFILTER;
- 
 -    q = (int)pow(Qvalue, 1.25);
 +    q = (int)pow(vp8_dc_quant(QIndex,0), 1.25);
  
      if (q < 8)
          q = 8;

diff --cc vp8/vp8_cx_iface.c
Simple merge