--- decoder.c	2002/07/24 23:09:28	1.35
+++ decoder.c	2002/09/22 17:01:36	1.39
@@ -53,9 +53,9 @@
  *  26.03.2002  interlacing support - moved transfers outside decode loop
  *  26.12.2001  decoder_mbinter: dequant/idct moved within if(coded) block
  *  22.12.2001  lock based interpolation
- *  01.12.2001  inital version; (c)2001 peter ross <pross@cs.rmit.edu.au>
+ *  01.12.2001  inital version; (c)2001 peter ross <pross@xvid.org>
  *
- *  $Id: decoder.c,v 1.35 2002/07/24 23:09:28 chl Exp $
+ *  $Id: decoder.c,v 1.39 2002/09/22 17:01:36 edgomez Exp $
  *
  *************************************************************************/
 
@@ -379,7 +379,7 @@
 
 	start_timer();
 	if(dec->quarterpel) {
-		DEBUG("QUARTERPEL");
+		DPRINTF(DPRINTF_DEBUG, "QUARTERPEL\n");
 		interpolate8x8_quarterpel(dec->cur.y, dec->refn[0].y, 16*x_pos, 16*y_pos,
 								  pMB->mvs[0].x, pMB->mvs[0].y, stride,  rounding);
 		interpolate8x8_quarterpel(dec->cur.y, dec->refn[0].y, 16*x_pos + 8, 16*y_pos,
@@ -509,7 +509,7 @@
 
 			if (dec->interlacing) {
 				mb->field_dct = BitstreamGetBit(bs);
-				DEBUG1("deci: field_dct: ", mb->field_dct);
+				DPRINTF(DPRINTF_DEBUG, "deci: field_dct: %d", mb->field_dct);
 			}
 
 			decoder_mbintra(dec, mb, x, y, acpred_flag, cbp, bs, quant,
@@ -653,18 +653,20 @@
 				mb->quant = quant;
 
 				if (dec->interlacing) {
-					mb->field_dct = BitstreamGetBit(bs);
-					DEBUG1("decp: field_dct: ", mb->field_dct);
+					if (cbp || intra) {
+						mb->field_dct = BitstreamGetBit(bs);
+						DPRINTF(DPRINTF_DEBUG, "decp: field_dct: %d", mb->field_dct);
+					}
 
 					if (mb->mode == MODE_INTER || mb->mode == MODE_INTER_Q) {
 						mb->field_pred = BitstreamGetBit(bs);
-						DEBUG1("decp: field_pred: ", mb->field_pred);
+						DPRINTF(DPRINTF_DEBUG, "decp: field_pred: %d", mb->field_pred);
 
 						if (mb->field_pred) {
 							mb->field_for_top = BitstreamGetBit(bs);
-							DEBUG1("decp: field_for_top: ", mb->field_for_top);
+							DPRINTF(DPRINTF_DEBUG, "decp: field_for_top: %d", mb->field_for_top);
 							mb->field_for_bot = BitstreamGetBit(bs);
-							DEBUG1("decp: field_for_bot: ", mb->field_for_bot);
+							DPRINTF(DPRINTF_DEBUG, "decp: field_for_bot: %d", mb->field_for_bot);
 						}
 					}
 				}
@@ -704,7 +706,8 @@
 								rounding);
 			} else				// not coded
 			{
-				DEBUG2("P-frame MB at (X,Y)=",x,y);
+				DPRINTF(DPRINTF_DEBUG, "P-frame MB at (X,Y)=(%d,%d)", x, y);
+
 				mb->mode = MODE_NOT_CODED;
 				mb->mvs[0].x = mb->mvs[1].x = mb->mvs[2].x = mb->mvs[3].x = 0;
 				mb->mvs[0].y = mb->mvs[1].y = mb->mvs[2].y = mb->mvs[3].y = 0;
@@ -1276,7 +1279,7 @@
 				break;
 
 			default:
-				DEBUG1("Not support B-frame mb_type =", mb->mb_type);
+				DPRINTF(DPRINTF_ERROR, "Not support B-frame mb_type = %d", mb->mb_type);
 			}
 
 		}						// end of FOR
@@ -1377,14 +1380,14 @@
 
 #ifdef BFRAMES_DEC
 	// test if no B_VOP
-	if (dec->low_delay) {
+        if (dec->low_delay || dec->frames == 0) {
 #endif
 	image_output(&dec->cur, dec->width, dec->height, dec->edged_width,
 					 frame->image, frame->stride, frame->colorspace);
 
 #ifdef BFRAMES_DEC
 	} else {
-		if (dec->frames >= 0) {
+                if (dec->frames >= 1) {
 			start_timer();
 			if ((vop_type == I_VOP || vop_type == P_VOP)) {
 				image_output(&dec->refn[0], dec->width, dec->height,