ref: 7985e023ebd83351b670bf5b18060f4d391b3a64
parent: 1ec4e270957a463cf7a8f320b23325d99577d9c8
parent: 7793b386a7007d72f78942ef7f41eb2eeb0410b5
author: John Koleszar <jkoleszar@google.com>
date: Mon Jun 27 07:55:15 EDT 2011
Merge "fix build issues for experimental branch" into experimental
--- a/configure
+++ b/configure
@@ -301,7 +301,6 @@
shared
small
postproc_visualizer
-
experimental
"
@@ -319,8 +318,10 @@
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
--- 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};