--- branches/dev-api-4/xvidcore/vfw/src/codec.c	2003/06/13 11:52:14	1069
+++ branches/dev-api-4/xvidcore/vfw/src/codec.c	2003/11/09 20:49:21	1202
@@ -208,7 +208,7 @@
 
 	if (lpbiOutput == NULL) 
 	{
-		return sizeof(BITMAPV4HEADER);
+		return sizeof(BITMAPINFOHEADER);
 	}
 
 	memcpy(outhdr, inhdr, sizeof(BITMAPINFOHEADER));
@@ -371,13 +371,11 @@
 		pass2.filename = codec->config.stats;
 
         pass2.keyframe_boost = codec->config.keyframe_boost;   /* keyframe boost percentage: [0..100...]; */
-        pass2.payback_method = codec->config.bitrate_payback_method;
-        pass2.bitrate_payback_delay = codec->config.bitrate_payback_delay;
         pass2.curve_compression_high = codec->config.curve_compression_high;
         pass2.curve_compression_low = codec->config.curve_compression_low;
+		pass2.overflow_control_strength = codec->config.overflow_control_strength;
         pass2.max_overflow_improvement = codec->config.twopass_max_overflow_improvement;
         pass2.max_overflow_degradation = codec->config.twopass_max_overflow_degradation;
-        pass2.kftreshold = codec->config.kftreshold;
 	    pass2.kfreduction = codec->config.kfreduction;
         pass2.min_key_interval = codec->config.min_key_interval;
         pass2.container_frame_overhead = 24;    /* AVI */
@@ -531,7 +529,7 @@
 		}
 	}
 
-    if ((profiles[codec->config.profile].flags & PROFILE_REDUCED) && 
+    if ((profiles[codec->config.profile].flags & PROFILE_REDUCED) &&
 	    codec->config.reduced_resolution) {
 		frame.vol_flags |= XVID_VOL_REDUCED_ENABLE;
 		frame.vop_flags |= XVID_VOP_REDUCED;	/* XXX: need auto decion mode */
@@ -542,8 +540,10 @@
 		frame.motion |= XVID_ME_QUARTERPELREFINE16 | XVID_ME_QUARTERPELREFINE8;
 	}
 
-	if ((profiles[codec->config.profile].flags & PROFILE_GMC) && codec->config.gmc)
+	if ((profiles[codec->config.profile].flags & PROFILE_GMC) && codec->config.gmc) {
 		frame.vol_flags |= XVID_VOL_GMC;
+		frame.motion |= XVID_ME_GME_REFINE;
+	}
 
 	if ((profiles[codec->config.profile].flags & PROFILE_INTERLACE) && codec->config.interlacing)
 		frame.vol_flags |= XVID_VOL_INTERLACING;
@@ -564,39 +564,46 @@
 		frame.vop_flags |= XVID_VOP_INTER4V;
 
 	if (codec->config.chromame)
-		frame.vop_flags |= XVID_ME_CHROMA16 + XVID_ME_CHROMA8;
+		frame.motion |= XVID_ME_CHROMA_PVOP + XVID_ME_CHROMA_BVOP;
+
+	if (codec->config.cartoon_mode) {
+		frame.vop_flags |= XVID_VOP_CARTOON;
+#if 0 /* Seems to cause crashes with P4 cpus */
+		frame.motion |= XVID_ME_DETECT_STATIC_MOTION;
+#endif
+	}
 
 	frame.motion |= pmvfast_presets[codec->config.motion_search];
 
 	switch (codec->config.vhq_mode)
 	{
 	case VHQ_MODE_DECISION :
-		frame.vop_flags |= XVID_VOP_MODEDECISION_BITS;
+		frame.vop_flags |= XVID_VOP_MODEDECISION_RD;
 		break;
 
 	case VHQ_LIMITED_SEARCH :
-		frame.vop_flags |= XVID_VOP_MODEDECISION_BITS;
-		frame.motion |= XVID_ME_HALFPELREFINE16_BITS;
-		frame.motion |= XVID_ME_QUARTERPELREFINE16_BITS;
+		frame.vop_flags |= XVID_VOP_MODEDECISION_RD;
+		frame.motion |= XVID_ME_HALFPELREFINE16_RD;
+		frame.motion |= XVID_ME_QUARTERPELREFINE16_RD;
 		break;
 
 	case VHQ_MEDIUM_SEARCH :
-		frame.vop_flags |= XVID_VOP_MODEDECISION_BITS;
-		frame.motion |= XVID_ME_HALFPELREFINE16_BITS;
-		frame.motion |= XVID_ME_HALFPELREFINE8_BITS;
-		frame.motion |= XVID_ME_QUARTERPELREFINE16_BITS;
-		frame.motion |= XVID_ME_QUARTERPELREFINE8_BITS;
-		frame.motion |= XVID_ME_CHECKPREDICTION_BITS;
+		frame.vop_flags |= XVID_VOP_MODEDECISION_RD;
+		frame.motion |= XVID_ME_HALFPELREFINE16_RD;
+		frame.motion |= XVID_ME_HALFPELREFINE8_RD;
+		frame.motion |= XVID_ME_QUARTERPELREFINE16_RD;
+		frame.motion |= XVID_ME_QUARTERPELREFINE8_RD;
+		frame.motion |= XVID_ME_CHECKPREDICTION_RD;
 		break;
 
 	case VHQ_WIDE_SEARCH :
-		frame.vop_flags |= XVID_VOP_MODEDECISION_BITS;
-		frame.motion |= XVID_ME_HALFPELREFINE16_BITS;
-		frame.motion |= XVID_ME_HALFPELREFINE8_BITS;
-		frame.motion |= XVID_ME_QUARTERPELREFINE16_BITS;
-		frame.motion |= XVID_ME_QUARTERPELREFINE8_BITS;
-		frame.motion |= XVID_ME_CHECKPREDICTION_BITS;
-		frame.motion |= XVID_ME_EXTSEARCH_BITS;
+		frame.vop_flags |= XVID_VOP_MODEDECISION_RD;
+		frame.motion |= XVID_ME_HALFPELREFINE16_RD;
+		frame.motion |= XVID_ME_HALFPELREFINE8_RD;
+		frame.motion |= XVID_ME_QUARTERPELREFINE16_RD;
+		frame.motion |= XVID_ME_QUARTERPELREFINE8_RD;
+		frame.motion |= XVID_ME_CHECKPREDICTION_RD;
+		frame.motion |= XVID_ME_EXTSEARCH_RD;
 		break;
 
 	default :