--- trunk/xvidcore/src/encoder.h	2002/06/23 03:58:32	234
+++ trunk/xvidcore/src/encoder.h	2002/09/04 21:42:56	404
@@ -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
@@ -26,17 +28,7 @@
  *  along with this program ; if not, write to the Free Software
  *  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.12 2002-06-23 03:58:32 suxen_drol Exp $
+ * $Id: encoder.h,v 1.21 2002-09-04 21:42:56 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -92,8 +84,8 @@
 	uint32_t fincr;
 	uint32_t fbase;
 
-#ifdef BFRAMES
-	int max_bframes;
+#ifdef _SMP
+	int num_threads;
 #endif
 
 	/* rounding type; alternate 0-1 after each interframe */
@@ -108,10 +100,8 @@
 
 	HINTINFO *hint;
 
-#ifdef BFRAMES
 	uint32_t m_seconds;
 	uint32_t m_ticks;
-#endif
 
 }
 MBParam;
@@ -128,10 +118,8 @@
 	uint32_t fcode;
 	uint32_t bcode;
 
-#ifdef BFRAMES
 	uint32_t seconds;
 	uint32_t ticks;
-#endif
 
 	IMAGE image;
 
@@ -176,30 +164,6 @@
 	IMAGE vInterHV;
 	IMAGE vInterHVf;
 
-#ifdef BFRAMES
-	/* constants */
-	int global;
-	int bquant_ratio;
-
-	/* image queue */
-	int queue_head;
-	int queue_tail;
-	int queue_size;
-	IMAGE *queue;
-
-	/* bframe buffer */
-	int bframenum_head;
-	int bframenum_tail;
-	int flush_bframes;
-
-	FRAMEINFO **bframes;
-	IMAGE f_refh;
-	IMAGE f_refv;
-	IMAGE f_refhv;
-
-	int m_framenum; /* debug frame num counter; unlike iFrameNum, does not reset at ivop */
-#endif
-
 	Statistics sStat;
 	RateControl rate_control;
 }