ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvs/xvidcore/src/utils/mem_align.h
(Generate patch)

Comparing xvidcore/src/utils/mem_align.h (file contents):
Revision 1.5 by edgomez, Sat Oct 19 11:41:11 2002 UTC vs.
Revision 1.6 by edgomez, Sun Nov 17 00:51:11 2002 UTC

# Line 5 | Line 5
5   *
6   *  Copyright(C) 2002 Michael Militzer <isibaar@xvid.org>
7   *
8 < *  This program is an implementation of a part of one or more MPEG-4
9 < *  Video tools as specified in ISO/IEC 14496-2 standard.  Those intending
10 < *  to use this software module in hardware or software products are
11 < *  advised that its use may infringe existing patents or copyrights, and
12 < *  any such use would be at such party's own risk.  The original
13 < *  developer of this software module and his/her company, and subsequent
14 < *  editors and their companies, will have no liability for use of this
15 < *  software or modifications or derivatives thereof.
8 > *  This file is part of XviD, a free MPEG-4 video encoder/decoder
9   *
10 < *  This program is free software; you can redistribute it and/or modify
11 < *  it under the terms of the GNU General Public License as published by
10 > *  XviD is free software; you can redistribute it and/or modify it
11 > *  under the terms of the GNU General Public License as published by
12   *  the Free Software Foundation; either version 2 of the License, or
13   *  (at your option) any later version.
14   *
# Line 28 | Line 21
21   *  along with this program; if not, write to the Free Software
22   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
23   *
24 + *  Under section 8 of the GNU General Public License, the copyright
25 + *  holders of XVID explicitly forbid distribution in the following
26 + *  countries:
27 + *
28 + *    - Japan
29 + *    - United States of America
30 + *
31 + *  Linking XviD statically or dynamically with other modules is making a
32 + *  combined work based on XviD.  Thus, the terms and conditions of the
33 + *  GNU General Public License cover the whole combination.
34 + *
35 + *  As a special exception, the copyright holders of XviD give you
36 + *  permission to link XviD with independent modules that communicate with
37 + *  XviD solely through the VFW1.1 and DShow interfaces, regardless of the
38 + *  license terms of these independent modules, and to copy and distribute
39 + *  the resulting combined work under terms of your choice, provided that
40 + *  every copy of the combined work is accompanied by a complete copy of
41 + *  the source code of XviD (the version of XviD used to produce the
42 + *  combined work), being distributed under the terms of the GNU General
43 + *  Public License plus this exception.  An independent module is a module
44 + *  which is not derived from or based on XviD.
45 + *
46 + *  Note that people who make modified versions of XviD are not obligated
47 + *  to grant this special exception for their modified versions; it is
48 + *  their choice whether to do so.  The GNU General Public License gives
49 + *  permission to release a modified version without this exception; this
50 + *  exception also makes it possible to release a modified version which
51 + *  carries forward this exception.
52 + *
53   * $Id$
54   *
55   ****************************************************************************/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines