--- trunk/xvidcore/LICENSE	2002/11/17 01:20:32	657
+++ trunk/xvidcore/LICENSE	2003/02/15 15:22:19	851
@@ -1,57 +1,3 @@
-                           XVID LICENSE
-----------------------------------------------------------------------
-
-XviD is licensed under the terms of the GNU GPL + Link over controlled
-interface + location restrictions.
-
-The first part of the file presents the location restrictions
-The second part of the file describes the linking permission.
-The third part of the file is the GNU GPL v2.
-
-
-
-                       LOCATION RESTRICTIONS
-----------------------------------------------------------------------
-
-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 PERMISSION
-----------------------------------------------------------------------
-
-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.
-
-
-
-                            THE GNU GPL
-----------------------------------------------------------------------
-
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991