--- branches/dev-api-4/xvidcore/src/motion/sad.c	2003/04/10 13:05:54	982
+++ branches/dev-api-4/xvidcore/src/motion/sad.c	2003/09/10 22:19:00	1142
@@ -1,42 +1,27 @@
-/**************************************************************************
+/*****************************************************************************
  *
- *	XVID MPEG-4 VIDEO CODEC
- *	sum of absolute difference
+ *  XVID MPEG-4 VIDEO CODEC
+ *  - Sum Of Absolute Difference related code -
  *
- *	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) 2001-2003 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
- *	the Free Software Foundation; either version 2 of the License, or
- *	(at your option) any later version.
+ *  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
+ *  the Free Software Foundation ; either version 2 of the License, or
+ *  (at your option) any later version.
  *
- *	This program is distributed in the hope that it will be useful,
- *	but WITHOUT ANY WARRANTY; without even the implied warranty of
- *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *	GNU General Public License for more details.
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY ; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
  *
- *	You should have received a copy of the GNU General Public License
- *	along with this program; if not, write to the Free Software
- *	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program ; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- *************************************************************************/
-
-/**************************************************************************
- *
- *	History:
+ * $Id: sad.c,v 1.13.2.6 2003-09-10 22:19:00 edgomez Exp $
  *
- *	14.02.2002	added sad16bi_c()
- *	10.11.2001	initial version; (c)2001 peter ross <pross@cs.rmit.edu.au>
- *
- *************************************************************************/
-
+ ****************************************************************************/
 
 #include "../portab.h"
 #include "../global.h"
@@ -47,7 +32,7 @@
 sad16FuncPtr sad16;
 sad8FuncPtr sad8;
 sad16biFuncPtr sad16bi;
-sad8biFuncPtr sad8bi;		// not really sad16, but no difference in prototype
+sad8biFuncPtr sad8bi;		/* not really sad16, but no difference in prototype */
 dev16FuncPtr dev16;
 sad16vFuncPtr sad16v;
 
@@ -243,9 +228,9 @@
 			   int32_t *sad)
 {
 	sad[0] = sad16(cur, ref, stride, 256*4096);
-	sad[1] = sad16(cur + 8, ref + 8, stride, 256*4096);
-	sad[2] = sad16(cur + 8*stride, ref + 8*stride, stride, 256*4096);
-	sad[3] = sad16(cur + 8*stride + 8, ref + 8*stride + 8, stride, 256*4096);
+	sad[1] = sad16(cur + 16, ref + 16, stride, 256*4096);
+	sad[2] = sad16(cur + 16*stride, ref + 16*stride, stride, 256*4096);
+	sad[3] = sad16(cur + 16*stride + 16, ref + 16*stride + 16, stride, 256*4096);
 	
 	return sad[0]+sad[1]+sad[2]+sad[3];
 }
@@ -291,7 +276,4 @@
 	}
 
 	return MRSAD16_CORRFACTOR * sad;
-
 }
-
-