--- qpel.h	2005/01/05 23:02:15	1.6
+++ qpel.h	2008/11/26 01:04:34	1.8
@@ -19,7 +19,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: qpel.h,v 1.6 2005/01/05 23:02:15 edgomez Exp $
+ * $Id: qpel.h,v 1.8 2008/11/26 01:04:34 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -73,7 +73,7 @@
 extern XVID_QP_FUNCS xvid_QP_Funcs_C;       /* for P-frames */
 extern XVID_QP_FUNCS xvid_QP_Add_Funcs_C;   /* for B-frames */
 
-#ifdef ARCH_IS_IA32
+#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
 extern XVID_QP_FUNCS xvid_QP_Funcs_mmx;
 extern XVID_QP_FUNCS xvid_QP_Add_Funcs_mmx;
 #endif
@@ -83,11 +83,6 @@
 extern XVID_QP_FUNCS xvid_QP_Add_Funcs_Altivec_C;
 #endif
 
-#ifdef ARCH_IS_X86_64
-extern XVID_QP_FUNCS xvid_QP_Funcs_x86_64;
-extern XVID_QP_FUNCS xvid_QP_Add_Funcs_x86_64;
-#endif
-
 extern XVID_QP_FUNCS *xvid_QP_Funcs;      /* <- main pointer for enc/dec structure */
 extern XVID_QP_FUNCS *xvid_QP_Add_Funcs;  /* <- main pointer for enc/dec structure */
 
@@ -136,13 +131,8 @@
 	Ops = xvid_QP_Funcs;
 	quads = (dx&3) | ((dy&3)<<2);
 
-	x_int = xRef/4;
-	if (xRef < 0 && xRef % 4)
-		x_int--;
-
-	y_int	 = yRef/4;
-	if (yRef < 0 && yRef % 4)
-		y_int--;
+	x_int = xRef >> 2;
+	y_int = yRef >> 2;
 
 	dst = cur + y * stride + x;
 	src = refn + y_int * (int)stride + x_int;
@@ -240,13 +230,8 @@
 	Ops_Copy = xvid_QP_Funcs;
 	quads = (dx&3) | ((dy&3)<<2);
 
-	x_int = xRef/4;
-	if (xRef < 0 && xRef % 4)
-		x_int--;
-
-	y_int	 = yRef/4;
-	if (yRef < 0 && yRef % 4)
-		y_int--;
+	x_int = xRef >> 2;
+	y_int = yRef >> 2;
 
 	dst = cur + y * stride + x;
 	src = refn + y_int * (int)stride + x_int;
@@ -344,13 +329,8 @@
 	Ops = xvid_QP_Funcs;
 	quads = (dx&3) | ((dy&3)<<2);
 
-	x_int = xRef/4;
-	if (xRef < 0 && xRef % 4)
-		x_int--;
-
-	y_int	 = yRef/4;
-	if (yRef < 0 && yRef % 4)
-		y_int--;
+	x_int = xRef >> 2;
+	y_int = yRef >> 2;
 
 	dst = cur + y * stride + x;
 	src = refn + y_int * (int)stride + x_int;
@@ -444,13 +424,8 @@
 	Ops = xvid_QP_Funcs;
 	quads = (dx&3) | ((dy&3)<<2);
 
-	x_int = xRef/4;
-	if (xRef < 0 && xRef % 4)
-		x_int--;
-
-	y_int	 = yRef/4;
-	if (yRef < 0 && yRef % 4)
-		y_int--;
+	x_int = xRef >> 2;
+	y_int = yRef >> 2;
 
 	dst = cur + y * stride + x;
 	src = refn + y_int * (int)stride + x_int;
@@ -545,13 +520,8 @@
 	Ops_Copy = xvid_QP_Funcs;
 	quads = (dx&3) | ((dy&3)<<2);
 
-	x_int = xRef/4;
-	if (xRef < 0 && xRef % 4)
-		x_int--;
-
-	y_int	 = yRef/4;
-	if (yRef < 0 && yRef % 4)
-		y_int--;
+	x_int = xRef >> 2;
+	y_int = yRef >> 2;
 
 	dst = cur + y * stride + x;
 	src = refn + y_int * (int)stride + x_int;