--- branches/release-1_0-branch/xvidcore/src/image/reduced.c	2004/05/30 02:30:33	1464
+++ branches/release-1_0-branch/xvidcore/src/image/reduced.c	2004/05/31 21:26:23	1465
@@ -5,8 +5,6 @@
  *
  *  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
  *  under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
@@ -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.3 2004-03-22 22:36:24 edgomez Exp $
+ * $Id: reduced.c,v 1.3.2.1 2004-05-31 21:26:23 edgomez Exp $
  *
  ****************************************************************************/