commit d231ce4fded9297dba765f959ea2dba40c8ad7d4
author Paul Wilkins <paulwilkins@google.com> Mon Jan 26 18:19:09 2015 -0800
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org> Mon Jan 26 18:19:09 2015 -0800
tree 908ca58575cefed16a8a26b40a9e04abf42f9cb0
parent d987dc4fdb0507903f7b58a879ac32645c6513d1
parent fd070220ff9bb531acd0ba7c67b84684aad0ef50

Merge "Adjust active maxq for GF groups."

build/make/iosbuild.sh

diff --git a/build/make/iosbuild.sh b/build/make/iosbuild.sh
index bdd6690..89fa681 100755
--- a/build/make/iosbuild.sh
+++ b/build/make/iosbuild.sh
@@ -18,6 +18,10 @@
 devnull='> /dev/null 2>&1'
 
 BUILD_ROOT="_iosbuild"
+CONFIGURE_ARGS="--disable-docs
+                --disable-examples
+                --disable-libyuv
+                --disable-unit-tests"
 DIST_DIR="_dist"
 FRAMEWORK_DIR="VPX.framework"
 HEADER_DIR="${FRAMEWORK_DIR}/Headers/vpx"
@@ -43,7 +47,7 @@
   mkdir "${target}"
   cd "${target}"
   eval "${LIBVPX_SOURCE_DIR}/configure" --target="${target}" \
-      --disable-docs ${EXTRA_CONFIGURE_ARGS} ${devnull}
+    ${CONFIGURE_ARGS} ${EXTRA_CONFIGURE_ARGS} ${devnull}
   export DIST_DIR
   eval make -j ${MAKE_JOBS} dist ${devnull}
   cd "${old_pwd}"
@@ -252,6 +256,7 @@
 cat << EOF
   BUILD_ROOT=${BUILD_ROOT}
   DIST_DIR=${DIST_DIR}
+  CONFIGURE_ARGS=${CONFIGURE_ARGS}
   EXTRA_CONFIGURE_ARGS=${EXTRA_CONFIGURE_ARGS}
   FRAMEWORK_DIR=${FRAMEWORK_DIR}
   HEADER_DIR=${HEADER_DIR}

vp9/encoder/vp9_encodeframe.c

diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index e142a31..4bcb658 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -402,7 +402,7 @@
                                BLOCK_SIZE bsize,
                                int mi_row,
                                int mi_col,
-                               int threshold,
+                               int64_t threshold,
                                BLOCK_SIZE bsize_min) {
   VP9_COMMON * const cm = &cpi->common;
   variance_node vt;