--- trunk/vfw/src/codec.c	2002/04/15 08:03:50	121
+++ trunk/vfw/src/codec.c	2002/05/13 10:07:41	176
@@ -23,6 +23,8 @@
  *
  *	History:
  *
+ *	25.04.2002	ICDECOMPRESS_PREROLL
+ *	17.04.2002	re-enabled lumi masking for 1st pass
  *	15.04.2002	updated cbr support
  *	04.04.2002	separated 2-pass code to 2pass.c
  *				interlacing support
@@ -364,14 +366,20 @@
 
 	frame.general |= XVID_HALFPEL;
 
-	if(codec->config.motion_search > 4)
+	if (codec->config.motion_search > 4)
 		frame.general |= XVID_INTER4V;
 
-	if(((codec->config.mode == DLG_MODE_2PASS_1) ? 0 : codec->config.lum_masking) == 1)
+	if (codec->config.lum_masking)
 		frame.general |= XVID_LUMIMASKING;
 
 	if (codec->config.interlacing)
 		frame.general |= XVID_INTERLACING;
+// fix 1pass modes/hinted MV by koepi
+	if (codec->config.hinted_me && (codec->config.mode == DLG_MODE_CBR || codec->config.mode == DLG_MODE_VBR_QUAL || codec->config.mode == DLG_MODE_VBR_QUANT))
+	{
+		codec->config.hinted_me = 0;
+	}
+// end of ugly hack
 
 	if (codec->config.hinted_me && codec->config.mode == DLG_MODE_2PASS_1)
 	{
@@ -666,7 +674,7 @@
 	frame.image = icd->lpOutput;
 	frame.stride = icd->lpbiOutput->biWidth;
 
-	if (~((icd->dwFlags & ICDECOMPRESS_HURRYUP) | (icd->dwFlags & ICDECOMPRESS_UPDATE)))
+	if (~((icd->dwFlags & ICDECOMPRESS_HURRYUP) | (icd->dwFlags & ICDECOMPRESS_UPDATE) | (icd->dwFlags & ICDECOMPRESS_PREROLL)))
 	{
 		if ((frame.colorspace = get_colorspace(icd->lpbiOutput)) == XVID_CSP_NULL) 
 		{