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

diff --git a/configure b/configure
index 86f2791aaf3a3cb3d5c99230f16e377e6588813c..92fa04c41179a6d1bd5304ab5cabb6801071cfa8 100755 (executable)
--- a/configure
+++ b/configure
@@ -301,7 +301,6 @@ CMDLINE_SELECT="
     shared
     small
     postproc_visualizer
-
     experimental
 "
 
@@ -319,9 +318,11 @@ process_cmdline() {
                 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
 }

diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c
index 9173272fc1092f9a8d8bd5c65aa448e4ba189310..f0ddf44fa3185cbeff7ceaadeb4917927a05b383 100644 (file)
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -630,7 +630,12 @@ static void macro_block_yrd( MACROBLOCK *mb,
 
     // 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 @@ static unsigned int vp8_encode_inter_mb_segment(MACROBLOCK *x, int const *labels
     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};