--- encoder.h	2002/08/07 10:09:00	1.17
+++ encoder.h	2002/11/02 15:52:30	1.18.2.4
@@ -36,7 +36,7 @@
  *               support for EXTENDED API
  *  - 22.08.2001 fixed bug in iDQtab
  *
- *  $Id: encoder.h,v 1.17 2002/08/07 10:09:00 chl Exp $
+ *  $Id: encoder.h,v 1.18.2.4 2002/11/02 15:52:30 chl Exp $
  *
  ****************************************************************************/
 
@@ -70,7 +70,8 @@
 {
 	I_VOP = 0,
 	P_VOP = 1,
-	B_VOP = 2
+	B_VOP = 2,
+	S_VOP = 3
 }
 VOP_TYPE;
 
@@ -96,9 +97,7 @@
 	int num_threads;
 #endif
 
-#ifdef BFRAMES
 	int max_bframes;
-#endif
 
 	/* rounding type; alternate 0-1 after each interframe */
 	/* 1 <= fixed_code <= 4
@@ -109,14 +108,11 @@
 	uint32_t m_quant_type;
 	uint32_t m_rounding_type;
 	uint32_t m_fcode;
+	uint32_t m_quarterpel;
 
 	HINTINFO *hint;
 
-#ifdef BFRAMES
-	uint32_t m_seconds;
-	uint32_t m_ticks;
-#endif
-
+	int64_t m_stamp;
 }
 MBParam;
 
@@ -129,18 +125,18 @@
 
 	VOP_TYPE coding_type;
 	uint32_t rounding_type;
+	uint32_t quarterpel;
 	uint32_t fcode;
 	uint32_t bcode;
 
-#ifdef BFRAMES
 	uint32_t seconds;
 	uint32_t ticks;
-#endif
+	int64_t stamp;
 
 	IMAGE image;
 
 	MACROBLOCK *mbs;
-
+	VECTOR GMC_MV;
 }
 FRAMEINFO;
 
@@ -180,7 +176,6 @@
 	IMAGE vInterHV;
 	IMAGE vInterHVf;
 
-#ifdef BFRAMES
 	/* constants */
 	int global;
 	int bquant_ratio;
@@ -203,11 +198,7 @@
 	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;