--- estimation_pvop.c	2004/03/22 22:36:24	1.2
+++ estimation_pvop.c	2004/05/27 14:19:04	1.2.2.2
@@ -21,7 +21,7 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: estimation_pvop.c,v 1.2 2004/03/22 22:36:24 edgomez Exp $
+ * $Id: estimation_pvop.c,v 1.2.2.2 2004/05/27 14:19:04 syskin Exp $
  *
  ****************************************************************************/
 
@@ -42,7 +42,7 @@
 
 static const int xvid_me_lambda_vec8[32] =
 	{     0    ,(int)(1.00235 * NEIGH_TEND_8X8 + 0.5),
-	(int)(1.15582 + NEIGH_TEND_8X8 + 0.5), (int)(1.31976*NEIGH_TEND_8X8 + 0.5),
+	(int)(1.15582*NEIGH_TEND_8X8 + 0.5), (int)(1.31976*NEIGH_TEND_8X8 + 0.5),
 	(int)(1.49591*NEIGH_TEND_8X8 + 0.5), (int)(1.68601*NEIGH_TEND_8X8 + 0.5),
 	(int)(1.89187*NEIGH_TEND_8X8 + 0.5), (int)(2.11542*NEIGH_TEND_8X8 + 0.5),
 	(int)(2.35878*NEIGH_TEND_8X8 + 0.5), (int)(2.62429*NEIGH_TEND_8X8 + 0.5),
@@ -854,6 +854,9 @@
 	if (Flags & XVID_ME_QUARTERPELREFINE8_RD)
 		Flags &= ~XVID_ME_QUARTERPELREFINE8;
 
+	if (Flags & XVID_ME_QUARTERPELREFINE16_RD)
+		Flags &= ~XVID_ME_QUARTERPELREFINE16;
+
 	if (!(VolFlags & XVID_VOL_QUARTERPEL))
 		Flags &= ~(XVID_ME_QUARTERPELREFINE16+XVID_ME_QUARTERPELREFINE8+XVID_ME_QUARTERPELREFINE16_RD+XVID_ME_QUARTERPELREFINE8_RD);