Merge remote branch 'origin/master' into experimental

Change-Id: Ib6c8596030140ed2b5e1dea76de024d27ad8ed86

diff --cc configure
index 0f30df2cb275b3ffb387c1c3558f1d27f8ce699a,70492c9f155728f4f99bf35e8f704c7d9068c374..bbe58069af1d1c30a754e86804d16fb7ac6b8f15
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -211,10 -211,8 +211,11 @@@ HAVE_LIST=
      alt_tree_layout
      pthread_h
      sys_mman_h
+     unistd_h
  "
 +EXPERIMENT_LIST="
 +    extend_qrange
 +"
  CONFIG_LIST="
      external_build
      install_docs

diff --cc vp8/common/generic/systemdependent.c
index fea6dcd23ef00d6a4b0cc638ae76844a829b1430,d981f34968ce82695424ecd83d43d5974b886023..c7fbb3e09b6d8a536576b7aea2c041eba9c8f60d
--- 1/vp8/common/generic/systemdependent.c
--- 2/vp8/common/generic/systemdependent.c
+++ b/vp8/common/generic/systemdependent.c
@@@ -88,14 -132,8 +133,17 @@@ void vp8_machine_specific_config(VP8_CO
  #if ARCH_ARM
      vp8_arch_arm_common_init(ctx);
  #endif
 +#if CONFIG_EXTEND_QRANGE
 +    rtcd->idct.idct1        = vp8_short_idct4x4llm_1_c;
 +    rtcd->idct.idct16       = vp8_short_idct4x4llm_c;
 +    rtcd->idct.idct1_scalar_add = vp8_dc_only_idct_add_c;
 +    rtcd->idct.iwalsh1      = vp8_short_inv_walsh4x4_1_c;
 +    rtcd->idct.iwalsh16     = vp8_short_inv_walsh4x4_c;
 +
 +#endif
 +
  
+ #if CONFIG_MULTITHREAD
+     ctx->processor_core_count = get_cpu_count();
+ #endif /* CONFIG_MULTITHREAD */
  }

diff --cc vp8/common/onyxc_int.h
Simple merge

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