--- decoder.c	2002/09/22 17:01:36	1.39
+++ decoder.c	2002/10/19 12:20:33	1.42
@@ -3,6 +3,9 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  -  Decoder main module  -
  *
+ *  Copyright(C) 2002 MinChen <chenm001@163.com>
+ *               2002 Peter Ross <pross@xvid.org>
+ *
  *  This program is an implementation of a part of one or more MPEG-4
  *  Video tools as specified in ISO/IEC 14496-2 standard.  Those intending
  *  to use this software module in hardware or software products are
@@ -33,7 +36,7 @@
  *  History:
  *
  *  15.07.2002  fix a bug in B-frame decode at DIRECT mode
- *              MinChen <chenm001@163.com>
+
  *  10.07.2002  added BFRAMES_DEC_DEBUG support
  *              Fix a little bug for low_delay flage
  *              MinChen <chenm001@163.com>
@@ -55,7 +58,7 @@
  *  22.12.2001  lock based interpolation
  *  01.12.2001  inital version; (c)2001 peter ross <pross@xvid.org>
  *
- *  $Id: decoder.c,v 1.39 2002/09/22 17:01:36 edgomez Exp $
+ *  $Id: decoder.c,v 1.42 2002/10/19 12:20:33 edgomez Exp $
  *
  *************************************************************************/
 
@@ -585,7 +588,7 @@
 
 	start_timer();
 	image_setedges(&dec->refn[0], dec->edged_width, dec->edged_height,
-				   dec->width, dec->height, dec->interlacing);
+				   dec->width, dec->height);
 	stop_edges_timer();
 
 	bound = 0;
@@ -1143,9 +1146,9 @@
 
 	start_timer();
 	image_setedges(&dec->refn[0], dec->edged_width, dec->edged_height,
-				   dec->width, dec->height, dec->interlacing);
+				   dec->width, dec->height);
 	image_setedges(&dec->refn[1], dec->edged_width, dec->edged_height,
-				   dec->width, dec->height, dec->interlacing);
+				   dec->width, dec->height);
 	stop_edges_timer();
 
 #ifdef BFRAMES_DEC_DEBUG
@@ -1337,24 +1340,24 @@
 		decoder_pframe(dec, &bs, rounding, quant, fcode_forward,
 					   intra_dc_threshold);
 #ifdef BFRAMES_DEC
-		DEBUG1("P_VOP  Time=", dec->time);
+		DPRINTF(DPRINTF_DEBUG, "P_VOP  Time=%d", dec->time);
 #endif
 		break;
 
 	case I_VOP:
 		decoder_iframe(dec, &bs, quant, intra_dc_threshold);
 #ifdef BFRAMES_DEC
-		DEBUG1("I_VOP  Time=", dec->time);
+		DPRINTF(DPRINTF_DEBUG, "I_VOP  Time=%d", dec->time);
 #endif
 		break;
 
 	case B_VOP:
 #ifdef BFRAMES_DEC
 		if (dec->time_pp > dec->time_bp) {
-			DEBUG1("B_VOP  Time=", dec->time);
+			DPRINTF(DPRINTF_DEBUG, "B_VOP  Time=%d", dec->time);
 			decoder_bframe(dec, &bs, quant, fcode_forward, fcode_backward);
 		} else {
-			DEBUG("broken B-frame!");
+			DPRINTF(DPRINTF_DEBUG, "Broken B_VOP");
 		}
 #else
 		image_copy(&dec->cur, &dec->refn[0], dec->edged_width, dec->height);
@@ -1372,7 +1375,7 @@
 
 #ifdef BFRAMES_DEC_DEBUG
 	if (frame->length != BitstreamPos(&bs) / 8){
-		DEBUG2("InLen/UseLen",frame->length, BitstreamPos(&bs) / 8);
+		DPRINTF(DPRINTF_DEBUG, "InLen: %d / UseLen: %d", frame->length, BitstreamPos(&bs) / 8);
 	}
 #endif
 	frame->length = BitstreamPos(&bs) / 8;