--- branches/dev-api-4/xvidcore/src/bitstream/bitstream.c	2003/03/26 11:01:03	948
+++ branches/dev-api-4/xvidcore/src/bitstream/bitstream.c	2003/03/26 14:56:49	949
@@ -1132,18 +1132,18 @@
 	int profile = 0x03;	/* simple profile/level 3 */
     int vol_type_ind=VIDOBJLAY_TYPE_SIMPLE;
 
-	if ( (pParam->vol_flags & XVID_QUARTERPEL) ||  
-         (pParam->vol_flags & XVID_GMC) || 
-		 (pParam->vol_flags & XVID_REDUCED_ENABLE))
+	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->vol_flags & XVID_REDUCED_ENABLE)) {
+    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->vol_flags & XVID_QUARTERPEL) || 
-        (pParam->vol_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;
     }
@@ -1223,11 +1223,11 @@
 	BitstreamPutBits(bs, pParam->height, 13);	// height
 	WRITE_MARKER();
 
-	BitstreamPutBit(bs, pParam->vol_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 ((pParam->vol_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
@@ -1245,9 +1245,9 @@
 	BitstreamPutBit(bs, 0);		// not_8_bit
 
 	// quant_type   0=h.263  1=mpeg4(quantizer tables)
-	BitstreamPutBit(bs, pParam->vol_flags & XVID_MPEGQUANT);
+	BitstreamPutBit(bs, pParam->vol_flags & XVID_VOL_MPEGQUANT);
 
-	if ((pParam->vol_flags & XVID_MPEGQUANT)) {
+	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());
@@ -1261,7 +1261,7 @@
 	}
 
 	if (vol_ver_id != 1) {
-		if ((pParam->vol_flags & XVID_QUARTERPEL))
+		if ((pParam->vol_flags & XVID_VOL_QUARTERPEL))
 			BitstreamPutBit(bs, 1);	 	//  quarterpel 
 		else
 			BitstreamPutBit(bs, 0);		// no quarterpel
@@ -1275,7 +1275,7 @@
 	{
 		BitstreamPutBit(bs, 0);		// newpred_enable
 		
-		BitstreamPutBit(bs, (pParam->vol_flags & XVID_REDUCED_ENABLE)?1:0);	
+		BitstreamPutBit(bs, (pParam->vol_flags & XVID_VOL_REDUCED_ENABLE)?1:0);	
 									/* reduced_resolution_vop_enabled */
 	}
 	
@@ -1283,7 +1283,7 @@
 
 	/* fake divx5 id, to ensure compatibility with divx5 decoder */
 #define DIVX5_ID "DivX000b000p"
-	if (pParam->max_bframes > 0 && (pParam->global_flags & XVID_PACKED)) {
+	if (pParam->max_bframes > 0 && (pParam->global_flags & XVID_GLOBAL_PACKED)) {
 		BitstreamWriteUserData(bs, DIVX5_ID, strlen(DIVX5_ID));
 	}
 
@@ -1340,14 +1340,14 @@
 	if ( (frame->coding_type == P_VOP) || (frame->coding_type == S_VOP) )
 		BitstreamPutBits(bs, frame->rounding_type, 1);
 
-	if ((frame->vol_flags & XVID_REDUCED_ENABLE))
-		BitstreamPutBit(bs, (frame->vop_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->vol_flags & XVID_INTERLACING)) {
-		BitstreamPutBit(bs, (frame->vop_flags & XVID_TOPFIELDFIRST));
-		BitstreamPutBit(bs, (frame->vop_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) {
@@ -1361,7 +1361,7 @@
 				bs_put_spritetrajectory(bs, frame->warp.duv[k].y ); // dv[k] 
 				WRITE_MARKER();
 
-			if ((frame->vol_flags & XVID_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);
 			}