--- trunk/xvidcore/src/bitstream/bitstream.c	2002/07/18 23:52:40	313
+++ trunk/xvidcore/src/bitstream/bitstream.c	2002/09/02 21:15:37	386
@@ -446,13 +446,12 @@
 
 
 				if (vol_ver_id != 1) {
-					dec->quarterpel = BitstreamGetBit(bs);	// quarter_sampe
-					if (dec->quarterpel) {
-						DPRINTF(DPRINTF_ERROR, "quarter_sample not supported");
-					}
-				} else {
-					dec->quarterpel = 0;
+					DEBUG("QUARTERPEL BITSTREAM");
+					dec->quarterpel = BitstreamGetBit(bs);	// quarter_sample
 				}
+				else
+					dec->quarterpel = 0;
+				
 
 				if (!BitstreamGetBit(bs))	// complexity_estimation_disable
 				{
@@ -547,16 +546,19 @@
 			if (coding_type != B_VOP) {
 				dec->last_time_base = dec->time_base;
 				dec->time_base += time_incr;
-				dec->time =
-					dec->time_base * time_increment_resolution +
+				dec->time = time_increment;
+
+/*					dec->time_base * time_increment_resolution +
 					time_increment;
-				dec->time_pp = (uint32_t) 
+*/				dec->time_pp = (uint32_t) 
 					(time_increment_resolution + dec->time - dec->last_non_b_time)%time_increment_resolution;
 				dec->last_non_b_time = dec->time;
 			} else {
-				dec->time =
+				dec->time = time_increment; 
+/*
 					(dec->last_time_base +
-					 time_incr) * time_increment_resolution + time_increment;
+					 time_incr) * time_increment_resolution + time_increment; 
+*/
 				dec->time_bp = (uint32_t) 
 					(time_increment_resolution + dec->last_non_b_time - dec->time)%time_increment_resolution;
 			}
@@ -714,7 +716,6 @@
 
 #ifdef BFRAMES
 	if (pParam->max_bframes > 0) {
-		//DPRINTF("low_delay=1");
 		BitstreamPutBit(bs, 1);	// vol_control_parameters
 		BitstreamPutBits(bs, 1, 2);	// chroma_format 1="4:2:0"
 		BitstreamPutBit(bs, 0);	// low_delay
@@ -722,7 +723,10 @@
 	} else
 #endif
 	{
-		BitstreamPutBits(bs, 0, 1);	// vol_control_parameters (0=not given)
+		BitstreamPutBit(bs, 1);	// vol_control_parameters
+		BitstreamPutBits(bs, 1, 2);	// chroma_format 1="4:2:0"
+		BitstreamPutBit(bs, 1);	// low_delay
+		BitstreamPutBit(bs, 0);	// vbv_parameters (0=not given)
 	}