--- trunk/xvidcore/vfw/src/config.h 2005/01/08 12:28:48 1588 +++ trunk/xvidcore/vfw/src/config.h 2005/03/27 03:59:42 1607 @@ -19,7 +19,7 @@ * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: config.h,v 1.5 2005-01-08 12:28:48 syskin Exp $ + * $Id: config.h,v 1.7 2005-03-27 03:59:42 suxen_drol Exp $ * ****************************************************************************/ #ifndef _CONFIG_H_ @@ -120,13 +120,11 @@ int tff; int qpel; int gmc; - int reduced_resolution; int use_bvop; int max_bframes; int bquant_ratio; int bquant_offset; int packed; - int closed_gov; int display_aspect_ratio; /* aspect ratio */ int ar_x, ar_y; /* picture aspect ratio */ int par_x, par_y; /* custom pixel aspect ratio */ @@ -230,10 +228,9 @@ #define PROFILE_INTERLACE 0x00000008 #define PROFILE_QPEL 0x00000010 #define PROFILE_GMC 0x00000020 -#define PROFILE_REDUCED 0x00000040 /* dynamic resolution conversion */ +#define PROFILE_4MV 0x00000040 +#define PROFILE_DXN 0x00000080 -#define PROFILE_AS (PROFILE_ADAPTQUANT|PROFILE_BVOP|PROFILE_MPEGQUANT|PROFILE_INTERLACE|PROFILE_QPEL|PROFILE_GMC) -#define PROFILE_ARTS (PROFILE_ADAPTQUANT|PROFILE_REDUCED) static const int PARS[][2] = { {1, 1}, @@ -261,7 +258,9 @@ int max_acpred_mbs; /* percentage */ int max_vbv_size; /* max vbv size (bits) 16368 bits */ int max_video_packet_length; /* bits */ - int max_bitrate; /* kbits/s */ + int max_bitrate; /* bits per second */ + int vbv_peakrate; /* max bits over anyone second period; 0=don't care */ + int dxn_max_bframes; /* dxn: max consecutive bframes */ unsigned int flags; } profile_t;