--- trunk/xvidcore/src/motion/motion_comp.c	2002/09/07 09:12:22	437
+++ trunk/xvidcore/src/motion/motion_comp.c	2002/11/26 23:44:11	677
@@ -3,21 +3,12 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - Motion Compensation module -
  *
- *  Copyright(C) 2002 Michael Militzer <michael@xvid.org>
- *  Copyright(C) 2002 Edouard Gomez <ed.gomez@wanadoo.fr>
- *  Copyright(C) 2002 Christoph Lampert <gruel@web.de>
- *
- *  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.
+ *  Copyright(C) 2002 Peter Ross <pross@xvid.org>
  *
- *  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
+ *  This file is part of XviD, a free MPEG-4 video encoder/decoder
+ *
+ *  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.
  *
@@ -30,6 +21,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: motion_comp.c,v 1.16 2002-11-26 23:44:10 edgomez Exp $
+ *
  *************************************************************************/
 
 #include "../encoder.h"
@@ -56,7 +78,7 @@
 {
 	int32_t ddx, ddy;
 
-	switch (((dx & 1) << 1) + (dy & 1))	// ((dx%2)?2:0)+((dy%2)?1:0)
+	switch (((dx & 1) << 1) + (dy & 1))	/* ((dx%2)?2:0)+((dy%2)?1:0) */
 	{
 	case 0:
 		ddx = dx / 2;
@@ -79,7 +101,7 @@
 						  refh + (int) ((y + ddy) * stride + x + ddx), stride);
 		break;
 
-	default:					// case 3:
+	default:					/* case 3: */
 		ddx = (dx - 1) / 2;
 		ddy = (dy - 1) / 2;
 		transfer_8to16sub(dct_codes, cur + y * stride + x,
@@ -145,7 +167,7 @@
 						  refv->v + 8 * j * edged_width / 2 + 8 * i,
 						  edged_width / 2);
 
-	} else						// mode == MODE_INTER4V
+	} else						/* mode == MODE_INTER4V */
 	{
 		int32_t sum, dx, dy;