--- trunk/xvidcore/src/image/reduced.c	2003/02/15 15:22:19	851
+++ trunk/xvidcore/src/image/reduced.c	2010/03/09 10:00:30	1883
@@ -5,9 +5,7 @@
  *
  *  Copyright(C) 2002 Pascal Massimino <skal@planet-d.net>
  *
- *  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
+ *  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.
@@ -21,36 +19,7 @@
  *  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: reduced.c,v 1.2 2003-02-15 15:22:18 edgomez Exp $
+ * $Id: reduced.c,v 1.5 2010-03-09 10:00:14 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -58,7 +27,7 @@
 #include "../global.h"
 #include "reduced.h"
 
-// function pointers
+/* function pointers */
 COPY_UPSAMPLED_8X8_16TO8 * copy_upsampled_8x8_16to8;
 ADD_UPSAMPLED_8X8_16TO8 * add_upsampled_8x8_16to8;
 VFILTER_31 * vfilter_31;
@@ -66,8 +35,9 @@
 FILTER_18X18_TO_8X8 * filter_18x18_to_8x8;
 FILTER_DIFF_18X18_TO_8X8 * filter_diff_18x18_to_8x8;
 
-//////////////////////////////////////////////////////////
-// Upsampling (1/3/3/1) filter
+/*----------------------------------------------------------------------------
+ * Upsampling (1/3/3/1) filter
+ *--------------------------------------------------------------------------*/
 
 #define ADD(dst,src)  (dst) = CLIP((dst)+(src), 0, 255)
 
@@ -109,7 +79,7 @@
     for(x=0; x<7; ++x)
       Filter_9331(Dst+2*x+1, Dst2+2*x+1, Src+x, Src+x+8);
     Filter_31(Dst+15, Dst2+15, Src+7, Src+7+8);
-    Src += 8; 
+    Src += 8;
     Dst += 2*BpS;
   }
   Dst[0] = CLIP(Src[0], 0, 255);
@@ -154,7 +124,7 @@
     for(x=0; x<7; ++x)
       Filter_Add_9331(Dst+2*x+1, Dst2+2*x+1, Src+x, Src+x+8);
     Filter_Add_31(Dst+15, Dst2+15, Src+7, Src+7+8);
-    Src += 8; 
+    Src += 8;
     Dst += 2*BpS;
   }
   ADD(Dst[0], Src[0]);
@@ -163,8 +133,9 @@
 }
 #undef ADD
 
-//////////////////////////////////////////////////////////
-// horizontal and vertical deblocking
+/*----------------------------------------------------------------------------
+ * horizontal and vertical deblocking
+ *--------------------------------------------------------------------------*/
 
 void xvid_HFilter_31_C(uint8_t *Src1, uint8_t *Src2, int Nb_Blks)
 {
@@ -190,12 +161,11 @@
   }
 }
 
-//////////////////////////////////////////////////////////
-// 16x16 -> 8x8  (1/3/3/1) downsampling
-//
-// Warning! These read 1 pixel outside of the input 16x16 block!
-//
-//////////////////////////////////////////////////////////
+/*----------------------------------------------------------------------------
+ * 16x16 -> 8x8  (1/3/3/1) downsampling
+ *
+ * Warning! These read 1 pixel outside of the input 16x16 block!
+ *--------------------------------------------------------------------------*/
 
 void xvid_Filter_18x18_To_8x8_C(int16_t *Dst, const uint8_t *Src, const int BpS)
 {
@@ -240,5 +210,3 @@
     T += 16;
   }
 }
-
-//////////////////////////////////////////////////////////