--- idct.c	2002/09/10 20:38:24	1.3
+++ idct.c	2002/11/26 23:44:10	1.5
@@ -6,17 +6,10 @@
  *  These routines are from Independent JPEG Group's free JPEG software
  *  Copyright (C) 1991-1998, Thomas G. Lane (see the file README.IJG)
  *
- *  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
- *  advised that its use may infringe existing patents or copyrights, and
- *  any such use would be at such party's own risk.  The original
- *  developer of this software module and his/her company, and subsequent
- *  editors and their companies, will have no liability for use of this
- *  software or modifications or derivatives thereof.
+ *  This file is part of XviD, a free MPEG-4 video encoder/decoder
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
+ *  XviD is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
@@ -29,6 +22,37 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
+ *  Under section 8 of the GNU General Public License, the copyright
+ *  holders of XVID explicitly forbid distribution in the following
+ *  countries:
+ *
+ *    - Japan
+ *    - United States of America
+ *
+ *  Linking XviD statically or dynamically with other modules is making a
+ *  combined work based on XviD.  Thus, the terms and conditions of the
+ *  GNU General Public License cover the whole combination.
+ *
+ *  As a special exception, the copyright holders of XviD give you
+ *  permission to link XviD with independent modules that communicate with
+ *  XviD solely through the VFW1.1 and DShow interfaces, regardless of the
+ *  license terms of these independent modules, and to copy and distribute
+ *  the resulting combined work under terms of your choice, provided that
+ *  every copy of the combined work is accompanied by a complete copy of
+ *  the source code of XviD (the version of XviD used to produce the
+ *  combined work), being distributed under the terms of the GNU General
+ *  Public License plus this exception.  An independent module is a module
+ *  which is not derived from or based on XviD.
+ *
+ *  Note that people who make modified versions of XviD are not obligated
+ *  to grant this special exception for their modified versions; it is
+ *  their choice whether to do so.  The GNU General Public License gives
+ *  permission to release a modified version without this exception; this
+ *  exception also makes it possible to release a modified version which
+ *  carries forward this exception.
+ *
+ * $Id: idct.c,v 1.5 2002/11/26 23:44:10 edgomez Exp $
+ *
  *************************************************************************/
 
 /**********************************************************/
@@ -56,16 +80,16 @@
 
 
 /* global declarations */
-//void init_idct_int32 (void);
-//void idct_int32 (short *block);
+/*void init_idct_int32 (void); */
+/*void idct_int32 (short *block); */
 
 /* private data */
 static short iclip[1024];		/* clipping table */
 static short *iclp;
 
 /* private prototypes */
-//static void idctrow _ANSI_ARGS_((short *blk));
-//static void idctcol _ANSI_ARGS_((short *blk));
+/*static void idctrow _ANSI_ARGS_((short *blk)); */
+/*static void idctcol _ANSI_ARGS_((short *blk)); */
 
 /* row (horizontal) IDCT
  *
@@ -77,13 +101,13 @@
  *        c[1..7] = 128*sqrt(2)
  */
 
-/*
+#if 0
 static void idctrow(blk)
 short *blk;
 {
   int X0, X1, X2, X3, X4, X5, X6, X7, X8;
 
-  // shortcut 
+  /* shortcut  */
   if (!((X1 = blk[4]<<11) | (X2 = blk[6]) | (X3 = blk[2]) |
         (X4 = blk[1]) | (X5 = blk[7]) | (X6 = blk[5]) | (X7 = blk[3])))
   {
@@ -91,9 +115,9 @@
     return;
   }
 
-  X0 = (blk[0]<<11) + 128; // for proper rounding in the fourth stage 
+  X0 = (blk[0]<<11) + 128; /* for proper rounding in the fourth stage  */
 
-  // first stage 
+  /* first stage  */
   X8 = W7*(X4+X5);
   X4 = X8 + (W1-W7)*X4;
   X5 = X8 - (W1+W7)*X5;
@@ -101,7 +125,7 @@
   X6 = X8 - (W3-W5)*X6;
   X7 = X8 - (W3+W5)*X7;
   
-  // second stage 
+  /* second stage  */
   X8 = X0 + X1;
   X0 -= X1;
   X1 = W6*(X3+X2);
@@ -112,7 +136,7 @@
   X6 = X5 + X7;
   X5 -= X7;
   
-  // third stage 
+  /* third stage  */
   X7 = X8 + X3;
   X8 -= X3;
   X3 = X0 + X2;
@@ -120,7 +144,7 @@
   X2 = (181*(X4+X5)+128)>>8;
   X4 = (181*(X4-X5)+128)>>8;
   
-  // fourth stage 
+  /* fourth stage  */
   blk[0] = (X7+X1)>>8;
   blk[1] = (X3+X2)>>8;
   blk[2] = (X0+X4)>>8;
@@ -129,7 +153,8 @@
   blk[5] = (X0-X4)>>8;
   blk[6] = (X3-X2)>>8;
   blk[7] = (X7-X1)>>8;
-}*/
+}
+#endif
 
 /* column (vertical) IDCT
  *
@@ -140,13 +165,13 @@
  * where: c[0]    = 1/1024
  *        c[1..7] = (1/1024)*sqrt(2)
  */
-/*
+#if	0
 static void idctcol(blk)
 short *blk;
 {
   int X0, X1, X2, X3, X4, X5, X6, X7, X8;
 
-  // shortcut 
+  /* shortcut  */
   if (!((X1 = (blk[8*4]<<8)) | (X2 = blk[8*6]) | (X3 = blk[8*2]) |
         (X4 = blk[8*1]) | (X5 = blk[8*7]) | (X6 = blk[8*5]) | (X7 = blk[8*3])))
   {
@@ -157,7 +182,7 @@
 
   X0 = (blk[8*0]<<8) + 8192;
 
-  // first stage 
+  /* first stage  */
   X8 = W7*(X4+X5) + 4;
   X4 = (X8+(W1-W7)*X4)>>3;
   X5 = (X8-(W1+W7)*X5)>>3;
@@ -165,7 +190,7 @@
   X6 = (X8-(W3-W5)*X6)>>3;
   X7 = (X8-(W3+W5)*X7)>>3;
   
-  // second stage
+  /* second stage */
   X8 = X0 + X1;
   X0 -= X1;
   X1 = W6*(X3+X2) + 4;
@@ -176,7 +201,7 @@
   X6 = X5 + X7;
   X5 -= X7;
   
-  // third stage 
+  /* third stage  */
   X7 = X8 + X3;
   X8 -= X3;
   X3 = X0 + X2;
@@ -184,7 +209,7 @@
   X2 = (181*(X4+X5)+128)>>8;
   X4 = (181*(X4-X5)+128)>>8;
   
-  // fourth stage
+  /* fourth stage */
   blk[8*0] = iclp[(X7+X1)>>14];
   blk[8*1] = iclp[(X3+X2)>>14];
   blk[8*2] = iclp[(X0+X4)>>14];
@@ -193,19 +218,20 @@
   blk[8*5] = iclp[(X0-X4)>>14];
   blk[8*6] = iclp[(X3-X2)>>14];
   blk[8*7] = iclp[(X7-X1)>>14];
-}*/
+}
+#endif
 
-// function pointer
+/* function pointer */
 idctFuncPtr idct;
 
 /* two dimensional inverse discrete cosine transform */
-//void j_rev_dct(block)
-//short *block;
+/*void j_rev_dct(block) */
+/*short *block; */
 void
 idct_int32(short *const block)
 {
 
-	// idct_int32_init() must be called before the first call to this function!
+	/* idct_int32_init() must be called before the first call to this function! */
 
 
 	/*int i;
@@ -221,7 +247,7 @@
 	static long X0, X1, X2, X3, X4, X5, X6, X7, X8;
 
 
-	for (i = 0; i < 8; i++)		// idct rows
+	for (i = 0; i < 8; i++)		/* idct rows */
 	{
 		blk = block + (i << 3);
 		if (!
@@ -233,9 +259,9 @@
 			continue;
 		}
 
-		X0 = (blk[0] << 11) + 128;	// for proper rounding in the fourth stage 
+		X0 = (blk[0] << 11) + 128;	/* for proper rounding in the fourth stage  */
 
-		// first stage 
+		/* first stage  */
 		X8 = W7 * (X4 + X5);
 		X4 = X8 + (W1 - W7) * X4;
 		X5 = X8 - (W1 + W7) * X5;
@@ -243,7 +269,7 @@
 		X6 = X8 - (W3 - W5) * X6;
 		X7 = X8 - (W3 + W5) * X7;
 
-		// second stage 
+		/* second stage  */
 		X8 = X0 + X1;
 		X0 -= X1;
 		X1 = W6 * (X3 + X2);
@@ -254,7 +280,7 @@
 		X6 = X5 + X7;
 		X5 -= X7;
 
-		// third stage 
+		/* third stage  */
 		X7 = X8 + X3;
 		X8 -= X3;
 		X3 = X0 + X2;
@@ -262,7 +288,7 @@
 		X2 = (181 * (X4 + X5) + 128) >> 8;
 		X4 = (181 * (X4 - X5) + 128) >> 8;
 
-		// fourth stage 
+		/* fourth stage  */
 
 		blk[0] = (short) ((X7 + X1) >> 8);
 		blk[1] = (short) ((X3 + X2) >> 8);
@@ -273,14 +299,14 @@
 		blk[6] = (short) ((X3 - X2) >> 8);
 		blk[7] = (short) ((X7 - X1) >> 8);
 
-	}							// end for ( i = 0; i < 8; ++i ) IDCT-rows
+	}							/* end for ( i = 0; i < 8; ++i ) IDCT-rows */
 
 
 
-	for (i = 0; i < 8; i++)		// idct columns
+	for (i = 0; i < 8; i++)		/* idct columns */
 	{
 		blk = block + i;
-		// shortcut 
+		/* shortcut  */
 		if (!
 			((X1 = (blk[8 * 4] << 8)) | (X2 = blk[8 * 6]) | (X3 =
 															 blk[8 *
@@ -296,7 +322,7 @@
 
 		X0 = (blk[8 * 0] << 8) + 8192;
 
-		// first stage 
+		/* first stage  */
 		X8 = W7 * (X4 + X5) + 4;
 		X4 = (X8 + (W1 - W7) * X4) >> 3;
 		X5 = (X8 - (W1 + W7) * X5) >> 3;
@@ -304,7 +330,7 @@
 		X6 = (X8 - (W3 - W5) * X6) >> 3;
 		X7 = (X8 - (W3 + W5) * X7) >> 3;
 
-		// second stage 
+		/* second stage  */
 		X8 = X0 + X1;
 		X0 -= X1;
 		X1 = W6 * (X3 + X2) + 4;
@@ -315,7 +341,7 @@
 		X6 = X5 + X7;
 		X5 -= X7;
 
-		// third stage 
+		/* third stage  */
 		X7 = X8 + X3;
 		X8 -= X3;
 		X3 = X0 + X2;
@@ -323,7 +349,7 @@
 		X2 = (181 * (X4 + X5) + 128) >> 8;
 		X4 = (181 * (X4 - X5) + 128) >> 8;
 
-		// fourth stage 
+		/* fourth stage  */
 		blk[8 * 0] = iclp[(X7 + X1) >> 14];
 		blk[8 * 1] = iclp[(X3 + X2) >> 14];
 		blk[8 * 2] = iclp[(X0 + X4) >> 14];
@@ -334,13 +360,13 @@
 		blk[8 * 7] = iclp[(X7 - X1) >> 14];
 	}
 
-}								// end function idct_int32(block)
+}								/* end function idct_int32(block) */
 
 
-//void
-//idct_int32_init()
+/*void */
+/*idct_int32_init() */
 void
-idct_int32_init()
+idct_int32_init(void)
 {
 	int i;