--- global.h	2002/12/08 05:38:56	1.13.2.4
+++ global.h	2002/09/04 21:59:27	1.14
@@ -1,3 +1,37 @@
+/*****************************************************************************
+ *
+ *  XVID MPEG-4 VIDEO CODEC
+ *  - Global structures, constants -
+ *
+ *  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
+ *  (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
+ *
+ * $Id: global.h,v 1.14 2002/09/04 21:59:27 edgomez Exp $
+ *
+ ****************************************************************************/
+
 #ifndef _GLOBAL_H_
 #define _GLOBAL_H_
 
@@ -11,6 +45,7 @@
 #define MODE_INTER4V	2
 #define	MODE_INTRA		3
 #define MODE_INTRA_Q	4
+#define MODE_STUFFING	7
 #define MODE_NOT_CODED	16
 
 /* --- bframe specific --- */
@@ -20,7 +55,6 @@
 #define MODE_BACKWARD		2
 #define MODE_FORWARD		3
 #define MODE_DIRECT_NONE_MV	4
-#define MODE_DIRECT_NO4V	5
 
 
 typedef struct
@@ -59,7 +93,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
@@ -70,26 +103,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;
@@ -124,4 +155,4 @@
 #define SIGN(X)   (((X)>0)?1:-1)
 
 
-#endif							/* _GLOBAL_H_ */
+#endif /* _GLOBAL_H_ */