--- trunk/xvidcore/vfw/src/codec.c	2009/05/27 17:27:56	1864
+++ trunk/xvidcore/vfw/src/codec.c	2010/11/16 14:42:07	1906
@@ -514,10 +514,7 @@
 		pass2.vbv_size = profiles[codec->config.profile].max_vbv_size;
 		pass2.vbv_initial = (profiles[codec->config.profile].max_vbv_size*3)/4; /* 75% */
 		pass2.vbv_maxrate = profiles[codec->config.profile].max_bitrate;
-
-    // XXX: xvidcore current provides a "peak bits over 3secs" constraint.
-    //      according to the latest dxn literature, a 1sec constraint is now used
-    pass2.vbv_peakrate = profiles[codec->config.profile].vbv_peakrate * 3;
+		pass2.vbv_peakrate = profiles[codec->config.profile].vbv_peakrate;
 
 		plugins[create.num_plugins].func = codec->xvid_plugin_2pass2_func;
 		plugins[create.num_plugins].param = &pass2;
@@ -999,6 +996,7 @@
 
 LRESULT decompress_begin(CODEC * codec, BITMAPINFO * lpbiInput, BITMAPINFO * lpbiOutput)
 {
+	BITMAPINFOHEADER * inhdr = &lpbiInput->bmiHeader;
 	xvid_gbl_init_t init;
 	xvid_dec_create_t create;
 	HKEY hKey;
@@ -1008,13 +1006,14 @@
 	memset(&init, 0, sizeof(init));
 	init.version = XVID_VERSION;
 	init.cpu_flags = codec->config.cpu;
-  init.debug = codec->config.debug;
+	init.debug = codec->config.debug;
 	codec->xvid_global_func(0, XVID_GBL_INIT, &init, NULL);
 
 	memset(&create, 0, sizeof(create));
 	create.version = XVID_VERSION;
 	create.width = lpbiInput->bmiHeader.biWidth;
 	create.height = lpbiInput->bmiHeader.biHeight;
+	create.fourcc = inhdr->biCompression;
 
 	switch(codec->xvid_decore_func(0, XVID_DEC_CREATE, &create, NULL)) 
 	{
@@ -1036,11 +1035,11 @@
 	RegOpenKeyEx(XVID_REG_KEY, XVID_REG_PARENT "\\" XVID_REG_CHILD, 0, KEY_READ, &hKey);
 
 	REG_GET_N("Brightness", pp_brightness, 0);
-	REG_GET_N("Deblock_Y",  pp_dy, 0)
-	REG_GET_N("Deblock_UV", pp_duv, 0)
-	REG_GET_N("Dering_Y",  pp_dry, 0)
-	REG_GET_N("Dering_UV", pp_druv, 0)
-	REG_GET_N("FilmEffect", pp_fe, 0)
+	REG_GET_N("Deblock_Y",  pp_dy, 0);
+	REG_GET_N("Deblock_UV", pp_duv, 0);
+	REG_GET_N("Dering_Y",  pp_dry, 0);
+	REG_GET_N("Dering_UV", pp_druv, 0);
+	REG_GET_N("FilmEffect", pp_fe, 0);
 
 	RegCloseKey(hKey);