--- encoder.h	2002/11/02 15:52:30	1.18.2.4
+++ encoder.h	2002/09/04 20:56:52	1.19
@@ -3,6 +3,8 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - Encoder header -
  *
+ *  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
@@ -27,18 +29,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  ****************************************************************************/
-/*****************************************************************************
- *
- *  History
- *
- *  - 13.06.2002 Added legal header
- *  - 22.08.2001 Added support for EXT_MODE encoding mode
- *               support for EXTENDED API
- *  - 22.08.2001 fixed bug in iDQtab
- *
- *  $Id: encoder.h,v 1.18.2.4 2002/11/02 15:52:30 chl Exp $
- *
- ****************************************************************************/
 
 #ifndef _ENCODER_H_
 #define _ENCODER_H_
@@ -70,8 +60,7 @@
 {
 	I_VOP = 0,
 	P_VOP = 1,
-	B_VOP = 2,
-	S_VOP = 3
+	B_VOP = 2
 }
 VOP_TYPE;
 
@@ -97,7 +86,9 @@
 	int num_threads;
 #endif
 
+#ifdef BFRAMES
 	int max_bframes;
+#endif
 
 	/* rounding type; alternate 0-1 after each interframe */
 	/* 1 <= fixed_code <= 4
@@ -108,11 +99,12 @@
 	uint32_t m_quant_type;
 	uint32_t m_rounding_type;
 	uint32_t m_fcode;
-	uint32_t m_quarterpel;
 
 	HINTINFO *hint;
 
-	int64_t m_stamp;
+	uint32_t m_seconds;
+	uint32_t m_ticks;
+
 }
 MBParam;
 
@@ -125,18 +117,16 @@
 
 	VOP_TYPE coding_type;
 	uint32_t rounding_type;
-	uint32_t quarterpel;
 	uint32_t fcode;
 	uint32_t bcode;
 
 	uint32_t seconds;
 	uint32_t ticks;
-	int64_t stamp;
 
 	IMAGE image;
 
 	MACROBLOCK *mbs;
-	VECTOR GMC_MV;
+
 }
 FRAMEINFO;
 
@@ -176,6 +166,7 @@
 	IMAGE vInterHV;
 	IMAGE vInterHVf;
 
+#ifdef BFRAMES
 	/* constants */
 	int global;
 	int bquant_ratio;
@@ -198,7 +189,11 @@
 	IMAGE f_refhv;
 	int bframenum_dx50bvop;
 
+	int last_pframe; 	
+	int last_sync; 	
+	int time_pp;
 	int m_framenum; /* debug frame num counter; unlike iFrameNum, does not reset at ivop */
+#endif
 
 	Statistics sStat;
 	RateControl rate_control;