--- bitstream.c	2003/02/19 21:59:30	1.39
+++ bitstream.c	2003/03/26 14:56:48	1.39.2.6
@@ -521,7 +521,8 @@
 				BitstreamShowBits(bs, 8) != VIDOBJLAY_TYPE_CORE && 
 				BitstreamShowBits(bs, 8) != VIDOBJLAY_TYPE_MAIN && 
 				BitstreamShowBits(bs, 8) != VIDOBJLAY_TYPE_ACE && 
-				BitstreamShowBits(bs, 8) != VIDOBJLAY_TYPE_ART_SIMPLE &&
+                BitstreamShowBits(bs, 8) != VIDOBJLAY_TYPE_ART_SIMPLE &&
+                BitstreamShowBits(bs, 8) != VIDOBJLAY_TYPE_ASP &&
 				BitstreamShowBits(bs, 8) != 0)	// BUGGY DIVX
 			{
 				DPRINTF(DPRINTF_ERROR,"video_object_type_indication %i not supported ",
@@ -640,7 +641,7 @@
 					{
 						if (dec->fixed_dimensions)
 						{
-							DPRINTF(DPRINTF_ERROR, "XVID_DEC_PARAM width/height does not match bitstream");
+							DPRINTF(DPRINTF_ERROR, "decoder width/height does not match bitstream");
 							return -1;
 						}
 						resize = 1;
@@ -1068,7 +1069,7 @@
 				BitstreamSkip(bs, 8);
 			}
 
-			DPRINTF(DPRINTF_STARTCODE, "<user_data>: %s\n", tmp);
+			DPRINTF(DPRINTF_STARTCODE, "<user_data>: %s", tmp);
 
 		    /* divx detection */
 			i = sscanf(tmp, "DivX%dBuild%d%c", &version, &build, &packed);
@@ -1123,23 +1124,29 @@
 */
 void
 BitstreamWriteVolHeader(Bitstream * const bs,
-						const MBParam * pParam,
-						const FRAMEINFO * const frame)
+						const MBParam * pParam)
 {
 	static const unsigned int vo_id = 0;
 	static const unsigned int vol_id = 0;
 	int vol_ver_id=1;
 	int profile = 0x03;	/* simple profile/level 3 */
+    int vol_type_ind=VIDOBJLAY_TYPE_SIMPLE;
 
-	if ( pParam->m_quarterpel ||  (frame->global_flags & XVID_GMC) || 
-		 (pParam->global & XVID_GLOBAL_REDUCED))
+	if ( (pParam->vol_flags & XVID_VOL_QUARTERPEL) ||  
+         (pParam->vol_flags & XVID_VOL_GMC) || 
+		 (pParam->vol_flags & XVID_VOL_REDUCED_ENABLE))
 		vol_ver_id = 2;
 
-	if ((pParam->global & XVID_GLOBAL_REDUCED))
+    if ((pParam->vol_flags & XVID_VOL_REDUCED_ENABLE)) {
 		profile = 0x93;	/* advanced realtime simple profile/level 3 */
+        vol_type_ind = VIDOBJLAY_TYPE_ART_SIMPLE;
+    }
 
-	if (pParam->m_quarterpel ||  (frame->global_flags & XVID_GMC))
+	if ((pParam->vol_flags & XVID_VOL_QUARTERPEL) || 
+        (pParam->vol_flags & XVID_VOL_GMC)) {
 		profile = 0xf3;	/* advanced simple profile/level 2 */
+        vol_type_ind = VIDOBJLAY_TYPE_ASP;
+    }
 
 	// visual_object_sequence_start_code
 //	BitstreamPad(bs);
@@ -1203,8 +1210,12 @@
 
 	WRITE_MARKER();
 
-	BitstreamPutBit(bs, 1);		// fixed_vop_rate = 1
-	BitstreamPutBits(bs, pParam->fincr, log2bin(pParam->fbase));	// fixed_vop_time_increment
+    if (pParam->fincr>0) {
+	    BitstreamPutBit(bs, 1);		// fixed_vop_rate = 1
+	    BitstreamPutBits(bs, pParam->fincr, log2bin(pParam->fbase));	// fixed_vop_time_increment
+    }else{
+        BitstreamPutBit(bs, 0);		// fixed_vop_rate = 0
+    }
 
 	WRITE_MARKER();
 	BitstreamPutBits(bs, pParam->width, 13);	// width
@@ -1212,11 +1223,11 @@
 	BitstreamPutBits(bs, pParam->height, 13);	// height
 	WRITE_MARKER();
 
-	BitstreamPutBit(bs, frame->global_flags & XVID_INTERLACING);	// interlace
+	BitstreamPutBit(bs, pParam->vol_flags & XVID_VOL_INTERLACING);	// interlace
 	BitstreamPutBit(bs, 1);		// obmc_disable (overlapped block motion compensation)
 
 	if (vol_ver_id != 1) 
-	{	if (frame->global_flags & XVID_GMC)
+	{	if ((pParam->vol_flags & XVID_VOL_GMC))
 		{	BitstreamPutBits(bs, 2, 2);		// sprite_enable=='GMC'
 			BitstreamPutBits(bs, 2, 6);		// no_of_sprite_warping_points
 			BitstreamPutBits(bs, 3, 2);		// sprite_warping_accuracy 0==1/2, 1=1/4, 2=1/8, 3=1/16
@@ -1234,9 +1245,9 @@
 	BitstreamPutBit(bs, 0);		// not_8_bit
 
 	// quant_type   0=h.263  1=mpeg4(quantizer tables)
-	BitstreamPutBit(bs, pParam->m_quant_type);
+	BitstreamPutBit(bs, pParam->vol_flags & XVID_VOL_MPEGQUANT);
 
-	if (pParam->m_quant_type) {
+	if ((pParam->vol_flags & XVID_VOL_MPEGQUANT)) {
 		BitstreamPutBit(bs, get_intra_matrix_status());	// load_intra_quant_mat
 		if (get_intra_matrix_status()) {
 			bs_put_matrix(bs, get_intra_matrix());
@@ -1250,7 +1261,7 @@
 	}
 
 	if (vol_ver_id != 1) {
-		if (pParam->m_quarterpel)
+		if ((pParam->vol_flags & XVID_VOL_QUARTERPEL))
 			BitstreamPutBit(bs, 1);	 	//  quarterpel 
 		else
 			BitstreamPutBit(bs, 0);		// no quarterpel
@@ -1264,15 +1275,15 @@
 	{
 		BitstreamPutBit(bs, 0);		// newpred_enable
 		
-		BitstreamPutBit(bs, (pParam->global & XVID_GLOBAL_REDUCED)?1:0);	
+		BitstreamPutBit(bs, (pParam->vol_flags & XVID_VOL_REDUCED_ENABLE)?1:0);	
 									/* reduced_resolution_vop_enabled */
 	}
 	
 	BitstreamPutBit(bs, 0);		// scalability
 
 	/* fake divx5 id, to ensure compatibility with divx5 decoder */
-#define DIVX5_ID "DivX501b481p"
-	if (pParam->max_bframes > 0 && (pParam->global & XVID_GLOBAL_PACKED)) {
+#define DIVX5_ID "DivX000b000p"
+	if (pParam->max_bframes > 0 && (pParam->global_flags & XVID_GLOBAL_PACKED)) {
 		BitstreamWriteUserData(bs, DIVX5_ID, strlen(DIVX5_ID));
 	}
 
@@ -1329,14 +1340,14 @@
 	if ( (frame->coding_type == P_VOP) || (frame->coding_type == S_VOP) )
 		BitstreamPutBits(bs, frame->rounding_type, 1);
 
-	if ((pParam->global & XVID_GLOBAL_REDUCED))
-		BitstreamPutBit(bs, (frame->global_flags & XVID_REDUCED)?1:0);
+	if ((frame->vol_flags & XVID_VOL_REDUCED_ENABLE))
+		BitstreamPutBit(bs, (frame->vop_flags & XVID_VOP_REDUCED)?1:0);
 
 	BitstreamPutBits(bs, 0, 3);	// intra_dc_vlc_threshold
 
-	if (frame->global_flags & XVID_INTERLACING) {
-		BitstreamPutBit(bs, (frame->global_flags & XVID_TOPFIELDFIRST));
-		BitstreamPutBit(bs, (frame->global_flags & XVID_ALTERNATESCAN));
+	if ((frame->vol_flags & XVID_VOL_INTERLACING)) {
+		BitstreamPutBit(bs, (frame->vop_flags & XVID_VOP_TOPFIELDFIRST));
+		BitstreamPutBit(bs, (frame->vop_flags & XVID_VOP_ALTERNATESCAN));
 	}
 	
 	if (frame->coding_type == S_VOP) {
@@ -1350,7 +1361,7 @@
 				bs_put_spritetrajectory(bs, frame->warp.duv[k].y ); // dv[k] 
 				WRITE_MARKER();
 
-			if (pParam->m_quarterpel)
+			if ((frame->vol_flags & XVID_VOL_QUARTERPEL))
 			{
 				DPRINTF(DPRINTF_HEADER,"sprite_warping_point[%i] xy=(%i,%i) *QPEL*", k, frame->warp.duv[k].x/2, frame->warp.duv[k].y/2);
 			}