--- decoder.c	2002/09/26 01:54:54	1.37.2.1
+++ decoder.c	2002/09/21 03:07:56	1.38
@@ -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.37.2.1 2002/09/26 01:54:54 h Exp $
+ *  $Id: decoder.c,v 1.38 2002/09/21 03:07:56 suxen_drol Exp $
  *
  *************************************************************************/
 
@@ -268,10 +268,8 @@
 		start_timer();
 		if (cbp & (1 << (5 - i)))	// coded
 		{
-			int direction = dec->alternate_vertical_scan ?
-				2 : pMB->acpred_directions[i];
-
-			get_intra_block(bs, &block[i * 64], direction, start_coeff);
+			get_intra_block(bs, &block[i * 64], pMB->acpred_directions[i],
+							start_coeff);
 		}
 		stop_coding_timer();
 
@@ -409,14 +407,12 @@
 	stop_comp_timer();
 
 	for (i = 0; i < 6; i++) {
-		int direction = dec->alternate_vertical_scan ? 2 : 0;
-
 		if (cbp & (1 << (5 - i)))	// coded
 		{
 			memset(&block[i * 64], 0, 64 * sizeof(int16_t));	// clear
 
 			start_timer();
-			get_inter_block(bs, &block[i * 64], direction);
+			get_inter_block(bs, &block[i * 64]);
 			stop_coding_timer();
 
 			start_timer();
@@ -589,7 +585,7 @@
 
 	start_timer();
 	image_setedges(&dec->refn[0], dec->edged_width, dec->edged_height,
-				   dec->width, dec->height);
+				   dec->width, dec->height, dec->interlacing);
 	stop_edges_timer();
 
 	bound = 0;
@@ -880,14 +876,12 @@
 	stop_comp_timer();
 
 	for (i = 0; i < 6; i++) {
-		int direction = dec->alternate_vertical_scan ? 2 : 0;
-
 		if (cbp & (1 << (5 - i)))	// coded
 		{
 			memset(&block[i * 64], 0, 64 * sizeof(int16_t));	// clear
 
 			start_timer();
-			get_inter_block(bs, &block[i * 64], direction);
+			get_inter_block(bs, &block[i * 64]);
 			stop_coding_timer();
 
 			start_timer();
@@ -1048,14 +1042,12 @@
 	stop_comp_timer();
 
 	for (i = 0; i < 6; i++) {
-		int direction = dec->alternate_vertical_scan ? 2 : 0;
-
 		if (cbp & (1 << (5 - i)))	// coded
 		{
 			memset(&block[i * 64], 0, 64 * sizeof(int16_t));	// clear
 
 			start_timer();
-			get_inter_block(bs, &block[i * 64], direction);
+			get_inter_block(bs, &block[i * 64]);
 			stop_coding_timer();
 
 			start_timer();
@@ -1150,9 +1142,9 @@
 
 	start_timer();
 	image_setedges(&dec->refn[0], dec->edged_width, dec->edged_height,
-				   dec->width, dec->height);
+				   dec->width, dec->height, dec->interlacing);
 	image_setedges(&dec->refn[1], dec->edged_width, dec->edged_height,
-				   dec->width, dec->height);
+				   dec->width, dec->height, dec->interlacing);
 	stop_edges_timer();
 
 #ifdef BFRAMES_DEC_DEBUG