From: John Koleszar <jkoleszar@google.com>
Date: Tue, 15 Feb 2011 05:05:39 +0000 (-0500)
Subject: Merge remote branch 'internal/upstream' into HEAD
X-Git-Tag: v1.3.0~1217^2~380^2~379
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c6ea558c05f530f086d32ac3e81ae87608ba132e;p=libvpx

Merge remote branch 'internal/upstream' into HEAD
---

c6ea558c05f530f086d32ac3e81ae87608ba132e
diff --cc configure
index 20564fd35,0f55de3af..7158c4fca
--- a/configure
+++ b/configure
@@@ -260,12 -254,8 +259,11 @@@ CONFIG_LIST=
      realtime_only
      shared
      small
-     arm_asm_detok
      postproc_visualizer
      os_support
 +
 +    experimental
 +    ${EXPERIMENT_LIST}
  "
  CMDLINE_SELECT="
      extra_warnings
@@@ -304,10 -294,7 +302,9 @@@
      realtime_only
      shared
      small
-     arm_asm_detok
      postproc_visualizer
 +
 +    experimental
  "
  
  process_cmdline() {