--- trunk/xvidcore/src/encoder.h	2002/09/03 17:25:45	387
+++ trunk/xvidcore/src/encoder.h	2002/11/26 23:44:11	677
@@ -3,40 +3,54 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - Encoder header -
  *
- *  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
+ *  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
+ *  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
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- ****************************************************************************/
-/*****************************************************************************
- *
- *  History
+ *  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.
  *
- *  - 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 2002-09-03 17:24:26 chl Exp $
+ * $Id: encoder.h,v 1.25 2002-11-26 23:44:10 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -96,10 +110,6 @@
 	int num_threads;
 #endif
 
-#ifdef BFRAMES
-	int max_bframes;
-#endif
-
 	/* rounding type; alternate 0-1 after each interframe */
 	/* 1 <= fixed_code <= 4
 	   automatically adjusted using motion vector statistics inside
@@ -162,7 +172,7 @@
 	int iMaxKeyInterval;
 	int bitrate;
 
-	// images
+	/* images */
 
 	FRAMEINFO *current;
 	FRAMEINFO *reference;
@@ -172,38 +182,7 @@
 #endif
 	IMAGE vInterH;
 	IMAGE vInterV;
-	IMAGE vInterVf;
 	IMAGE vInterHV;
-	IMAGE vInterHVf;
-
-#ifdef BFRAMES
-	/* constants */
-	int global;
-	int bquant_ratio;
-	int frame_drop_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 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;