--- xvid.c	2002/06/14 13:27:52	1.18
+++ xvid.c	2002/06/26 15:59:51	1.23
@@ -31,11 +31,12 @@
  *
  *  History
  *
+ *	- 23.06.2002	added XVID_CPU_CHKONLY
  *  - 17.03.2002	Added interpolate8x8_halfpel_hv_xmm
  *  - 22.12.2001  API change: added xvid_init() - Isibaar
  *  - 16.12.2001	inital version; (c)2001 peter ross <pross@cs.rmit.edu.au>
  *
- *  $Id: xvid.c,v 1.18 2002/06/14 13:27:52 Isibaar Exp $
+ *  $Id: xvid.c,v 1.23 2002/06/26 15:59:51 ia64p Exp $
  *
  ****************************************************************************/
 
@@ -80,16 +81,24 @@
 
 	init_param = (XVID_INIT_PARAM *) param1;
 
+	/* Inform the client the API version */
+	init_param->api_version = API_VERSION;
+
+	/* Inform the client the core build - unused because we're still alpha */
+	init_param->core_build = 1000;
+
+	if ((init_param->cpu_flags & XVID_CPU_CHKONLY))
+	{
+		init_param->cpu_flags = check_cpu_features();
+		return XVID_ERR_OK;
+	}
+
 	/* Do we have to force CPU features  ? */
 	if ((init_param->cpu_flags & XVID_CPU_FORCE) > 0) {
 		cpu_flags = init_param->cpu_flags;
 	} else {
 
-#ifdef ARCH_X86
 		cpu_flags = check_cpu_features();
-#else
-		cpu_flags = 0;
-#endif
 		init_param->cpu_flags = cpu_flags;
 	}
 
@@ -184,9 +193,11 @@
 		transfer_8to16copy = transfer_8to16copy_mmx;
 		transfer_16to8copy = transfer_16to8copy_mmx;
 		transfer_8to16sub  = transfer_8to16sub_mmx;
+		transfer_8to16sub2 = transfer_8to16sub2_mmx;
 		transfer_16to8add  = transfer_16to8add_mmx;
 		transfer8x8_copy   = transfer8x8_copy_mmx;
 
+
 		/* Image Interpolation related functions */
 		interpolate8x8_halfpel_h  = interpolate8x8_halfpel_h_mmx;
 		interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_mmx;
@@ -223,6 +234,9 @@
 		interpolate8x8_halfpel_v  = interpolate8x8_halfpel_v_xmm;
 		interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_xmm;
 
+		/* Buffer transfer */
+		transfer_8to16sub2 = transfer_8to16sub2_xmm;
+
 		/* Colorspace transformation */
 		yuv_to_yv12 = yuv_to_yv12_xmm;
 
@@ -303,12 +317,6 @@
 #endif
 #endif
 
-	/* Inform the client the API version */
-	init_param->api_version = API_VERSION;
-
-	/* Inform the client the core build - unused because we're still alpha */
-	init_param->core_build = 1000;
-
 	return XVID_ERR_OK;
 }
 
@@ -362,6 +370,12 @@
 {
 	switch (opt) {
 	case XVID_ENC_ENCODE:
+#ifdef BFRAMES
+		if (((Encoder *) handle)->mbParam.max_bframes >= 0)
+		return encoder_encode_bframes((Encoder *) handle, (XVID_ENC_FRAME *) param1,
+							  (XVID_ENC_STATS *) param2);
+		else 
+#endif
 		return encoder_encode((Encoder *) handle, (XVID_ENC_FRAME *) param1,
 							  (XVID_ENC_STATS *) param2);