--- branches/release-1_3-branch/xvidcore/vfw/src/codec.c	2010/12/27 16:39:33	1925
+++ branches/release-1_3-branch/xvidcore/vfw/src/codec.c	2011/05/18 09:02:35	1985
@@ -19,7 +19,7 @@
  *	along with this program; if not, write to the Free Software
  *	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: codec.c,v 1.30 2010-12-27 16:11:05 Isibaar Exp $
+ * $Id$
  *
  *************************************************************************/
 
@@ -437,13 +437,21 @@
 	if ((profiles[codec->config.profile].flags & PROFILE_RESYNCMARKER) && codec->config.num_slices != 1) {
 		
 		if (codec->config.num_slices == 0) { /* auto */
-			int rows = (lpbiInput->bmiHeader.biHeight + 15) / 16;
-			int slices = (rows > 36) ? 4 : 1; /* use multiple slices only for HD resolutions */
+			int mb_width = (lpbiInput->bmiHeader.biWidth + 15) / 16;
+			int mb_height = (lpbiInput->bmiHeader.biHeight + 15) / 16;
 
-			create.num_slices = (rows > 45) ? 8 : slices;
+			int slices = (int)((mb_width*mb_height) / 811); /* use multiple slices only above SD resolutions for now */
 
-			if (create.num_slices > create.num_threads) 
-				create.num_slices = create.num_threads;
+			if (slices > 1) {
+				if (create.num_threads <= 1)
+					slices &= ~1; /* make even */
+				else if (create.num_threads <= slices)
+					slices = (slices / create.num_threads) * create.num_threads; /* multiple of threads */
+				else if (create.num_threads % slices)
+					slices = (!(create.num_threads%2)) ? (create.num_threads/2) : (create.num_threads/3);
+			}
+
+			create.num_slices = slices;
 		}
 		else {
 			create.num_slices = codec->config.num_slices; /* force manual value - by registry edit */
@@ -600,7 +608,12 @@
     if ((profiles[codec->config.profile].flags & PROFILE_EXTRA))
       create.global |= XVID_GLOBAL_DIVX5_USERDATA;
 
-	create.frame_drop_ratio = quality_preset->frame_drop_ratio;
+	if ((profiles[codec->config.profile].flags & PROFILE_EXTRA) || 
+		(profiles[codec->config.profile].flags & PROFILE_XVID)) {
+  	  create.frame_drop_ratio = 0;
+	} else {
+  	  create.frame_drop_ratio = quality_preset->frame_drop_ratio;
+	}
 
 	switch(codec->xvid_encore_func(0, XVID_ENC_CREATE, &create, NULL))
 	{
@@ -911,13 +924,16 @@
 {
 	BITMAPINFOHEADER * inhdr = &lpbiInput->bmiHeader;
 	BITMAPINFOHEADER * outhdr = &lpbiOutput->bmiHeader;
+	int in_csp = XVID_CSP_NULL, out_csp = XVID_CSP_NULL;
 
 	if (lpbiInput == NULL) 
 	{
 		return ICERR_ERROR;
 	}
 
-	if (inhdr->biCompression != FOURCC_XVID && inhdr->biCompression != FOURCC_DIVX && inhdr->biCompression != FOURCC_DX50 && get_colorspace(inhdr) == XVID_CSP_NULL)
+	if (inhdr->biCompression != FOURCC_XVID && inhdr->biCompression != FOURCC_DIVX && inhdr->biCompression != FOURCC_DX50 && inhdr->biCompression != FOURCC_MP4V &&
+		inhdr->biCompression != FOURCC_xvid && inhdr->biCompression != FOURCC_divx && inhdr->biCompression != FOURCC_dx50 && inhdr->biCompression != FOURCC_mp4v &&
+		(in_csp = get_colorspace(inhdr)) != XVID_CSP_YV12)
 	{
 		return ICERR_BADFORMAT;
 	}
@@ -927,9 +943,12 @@
 		return ICERR_OK;
 	}
 
+	out_csp = get_colorspace(outhdr);
+
 	if (inhdr->biWidth != outhdr->biWidth ||
 		inhdr->biHeight != outhdr->biHeight ||
-		get_colorspace(outhdr) == XVID_CSP_NULL) 
+		out_csp == XVID_CSP_NULL ||
+		(in_csp == XVID_CSP_YV12 && in_csp != out_csp)) 
 	{
 		return ICERR_BADFORMAT;
 	}
@@ -1072,7 +1091,12 @@
 	/* --- yv12 --- */	
 	if (icd->lpbiInput->biCompression != FOURCC_XVID &&
 		 icd->lpbiInput->biCompression != FOURCC_DIVX &&
-		 icd->lpbiInput->biCompression != FOURCC_DX50)
+		 icd->lpbiInput->biCompression != FOURCC_DX50 &&
+		 icd->lpbiInput->biCompression != FOURCC_MP4V &&
+		 icd->lpbiInput->biCompression != FOURCC_xvid &&
+		 icd->lpbiInput->biCompression != FOURCC_divx &&
+		 icd->lpbiInput->biCompression != FOURCC_dx50 &&
+		 icd->lpbiInput->biCompression != FOURCC_mp4v)
 	{
 		xvid_gbl_convert_t convert;