--- trunk/xvidcore/src/global.h 2002/10/19 11:41:12 603 +++ trunk/xvidcore/src/global.h 2002/11/26 23:44:11 677 @@ -5,30 +5,52 @@ * * Copyright(C) 2002 Michael Militzer * - * 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. - * - * 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 + * 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 * (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 + * 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 + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: global.h,v 1.15 2002-10-19 11:41:11 edgomez Exp $ + * 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: global.h,v 1.17 2002-11-26 23:44:10 edgomez Exp $ * ****************************************************************************/ @@ -75,37 +97,37 @@ typedef struct { - // decoder/encoder + /* decoder/encoder */ VECTOR mvs[4]; short int pred_values[6][MBPRED_SIZE]; int acpred_directions[6]; int mode; - int quant; // absolute quant + int quant; /* absolute quant */ int field_dct; int field_pred; int field_for_top; int field_for_bot; - // encoder specific + /* encoder specific */ VECTOR mv16; VECTOR pmvs[4]; - int32_t sad8[4]; // SAD values for inter4v-VECTORs - int32_t sad16; // SAD value for inter-VECTOR + int32_t sad8[4]; /* SAD values for inter4v-VECTORs */ + int32_t sad16; /* SAD value for inter-VECTOR */ int dquant; int cbp; - // bframe stuff + /* bframe stuff */ VECTOR b_mvs[4]; VECTOR b_pmvs[4]; - // bframe direct mode + /* bframe direct mode */ VECTOR directmv[4]; VECTOR deltamv; @@ -113,14 +135,14 @@ int mb_type; int dbquant; - // stuff for block based ME (needed for Qpel ME) - // backup of last integer ME vectors/sad + /* stuff for block based ME (needed for Qpel ME) */ + /* backup of last integer ME vectors/sad */ VECTOR i_mv16; VECTOR i_mvs[4]; - int32_t i_sad8[4]; // SAD values for inter4v-VECTORs - int32_t i_sad16; // SAD value for inter-VECTOR + int32_t i_sad8[4]; /* SAD values for inter4v-VECTORs */ + int32_t i_sad16; /* SAD value for inter-VECTOR */ } MACROBLOCK; @@ -147,7 +169,7 @@ return quant - 6; } -// useful macros +/* useful macros */ #define MIN(X, Y) ((X)<(Y)?(X):(Y)) #define MAX(X, Y) ((X)>(Y)?(X):(Y))