--- global.h	2002/12/29 16:59:50	1.13.2.6
+++ global.h	2002/11/16 23:38:16	1.16
@@ -1,3 +1,59 @@
+/*****************************************************************************
+ *
+ *  XVID MPEG-4 VIDEO CODEC
+ *  - Global structures, constants -
+ *
+ *  Copyright(C) 2002 Michael Militzer <isibaar@xvid.org>
+ *
+ *  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
+ *  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
+ *  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: global.h,v 1.16 2002/11/16 23:38:16 edgomez Exp $
+ *
+ ****************************************************************************/
+
 #ifndef _GLOBAL_H_
 #define _GLOBAL_H_
 
@@ -11,8 +67,8 @@
 #define MODE_INTER4V	2
 #define	MODE_INTRA		3
 #define MODE_INTRA_Q	4
+#define MODE_STUFFING	7
 #define MODE_NOT_CODED	16
-#define MODE_NOT_CODED_GMC	17
 
 /* --- bframe specific --- */
 
@@ -21,15 +77,6 @@
 #define MODE_BACKWARD		2
 #define MODE_FORWARD		3
 #define MODE_DIRECT_NONE_MV	4
-#define MODE_DIRECT_NO4V	5
-
-typedef struct
-{
-	uint8_t *y;
-	uint8_t *u;
-	uint8_t *v;
-}
-IMAGE;
 
 
 typedef struct
@@ -68,7 +115,6 @@
 
 	VECTOR mv16;
 	VECTOR pmvs[4];
-	VECTOR qmvs[4];				// mvs in quarter pixel resolution
 
 	int32_t sad8[4];			// SAD values for inter4v-VECTORs
 	int32_t sad16;				// SAD value for inter-VECTOR
@@ -79,26 +125,24 @@
 	// bframe stuff
 
 	VECTOR b_mvs[4];
-	VECTOR b_qmvs[4];
-//	VECTOR b_pmvs[1];
+	VECTOR b_pmvs[4];
 
 	// bframe direct mode
 
-//	VECTOR directmv[4];
-//	VECTOR deltamv;
+	VECTOR directmv[4];
+	VECTOR deltamv;
 
 	int mb_type;
 	int dbquant;
 
 	// stuff for block based ME (needed for Qpel ME)
 	// backup of last integer ME vectors/sad
-
-//	VECTOR i_mv16;
+	
+	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_sad16;	// SAD value for inter-VECTOR
 
 }
 MACROBLOCK;
@@ -133,4 +177,4 @@
 #define SIGN(X)   (((X)>0)?1:-1)
 
 
-#endif							/* _GLOBAL_H_ */
+#endif /* _GLOBAL_H_ */