commit 7793b386a7007d72f78942ef7f41eb2eeb0410b5
author Yaowu Xu <yaowu@google.com> Wed Jun 22 15:07:04 2011 -0700
committer Yaowu Xu <yaowu@google.com> Thu Jun 23 09:19:44 2011 -0700
tree 39f269387d74beec3a0b9230967bfb79b6062e14
parent 786246ebf1fd4b875f33a8b0c35bab2a3df911b3

fix build issues for experimental branch

experimental branch build was broken from some merge artifacts, this
commit fixes those issues to enable the experimental branch to build.

Change-Id: Ic52b2d2f1d1b80abb7ecaa4c0927bcf887ac0c2a

configure

diff --git a/configure b/configure
index 86f2791..92fa04c 100755
--- a/configure
+++ b/configure
@@ -301,7 +301,6 @@
     shared
     small
     postproc_visualizer
-
     experimental
 "
 
@@ -319,9 +318,11 @@
                 log_echo "Ignoring $opt -- not in experimental mode."
             fi
         else
-            process_common_cmdline "$opt"
+            process_common_cmdline $opt
         fi
         ;;
+        *) process_common_cmdline $opt
+        ;;
         esac
     done
 }

vp8/encoder/rdopt.c

diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c
index 9173272..f0ddf44 100644
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -630,7 +630,12 @@
 
     // Distortion
     d = ENCODEMB_INVOKE(rtcd, mberr)(mb, 1) << 2;
+
+#if CONFIG_EXTEND_QRANGE
+    d += ENCODEMB_INVOKE(rtcd, berr)(mb_y2->coeff, x_y2->dqcoeff)<<2;
+#else
     d += ENCODEMB_INVOKE(rtcd, berr)(mb_y2->coeff, x_y2->dqcoeff);
+#endif
 
     *Distortion = (d >> 4);
 
@@ -1049,10 +1054,7 @@
     return distortion;
 }
 
-#if CONFIG_EXTEND_QRANGE
-    d += ENCODEMB_INVOKE(rtcd, berr)(mb_y2->coeff, x_y2->dqcoeff)<<2;
-#else
-#endif
+
 
 static const unsigned int segmentation_to_sseshift[4] = {3, 3, 2, 0};