--- xvid.h	2008/11/28 18:16:42	1.64
+++ xvid.h	2010/10/10 19:19:55	1.69
@@ -1,9 +1,9 @@
 /*****************************************************************************
  *
  * XVID MPEG-4 VIDEO CODEC
- * - XviD Main header file -
+ * - Xvid Main header file -
  *
- *  Copyright(C) 2001-2004 Peter Ross <pross@xvid.org>
+ *  Copyright(C) 2001-2010 Peter Ross <pross@xvid.org>
  *
  *  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
@@ -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: xvid.h,v 1.64 2008/11/28 18:16:42 Isibaar Exp $
+ * $Id: xvid.h,v 1.69 2010/10/10 19:19:55 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -73,7 +73,7 @@
  * doesnt hurt but not increasing it could cause difficulty for decoders in the
  * future
  */
-#define XVID_BS_VERSION 55 
+#define XVID_BS_VERSION 57 
 
 /*****************************************************************************
  * error codes
@@ -129,6 +129,9 @@
 #define XVID_PROFILE_S_L1    0x01
 #define XVID_PROFILE_S_L2    0x02
 #define XVID_PROFILE_S_L3    0x03
+#define XVID_PROFILE_S_L4a   0x04
+#define XVID_PROFILE_S_L5    0x05
+#define XVID_PROFILE_S_L6    0x06
 #define XVID_PROFILE_ARTS_L1 0x91 /* advanced realtime simple */
 #define XVID_PROFILE_ARTS_L2 0x92
 #define XVID_PROFILE_ARTS_L3 0x93
@@ -236,13 +239,14 @@
 extern int xvid_decore(void *handle, int opt, void *param1, void *param2);
 
 /* XVID_DEC_CREATE param 1
-	image width & height may be specified here when the dimensions are
-	known in advance. */
+	image width & height as well as FourCC code may be specified 
+	here when known in advance (e.g. being read from container) */
 typedef struct {
 	int version;
-	int width;     /* [in:opt] image width */
-	int height;    /* [in:opt] image width */
-	void * handle; /* [out]	   decore context handle */
+	int width;      /* [in:opt] image width */
+	int height;     /* [in:opt] image width */
+	void * handle;  /* [out]    decore context handle */
+	int fourcc;     /* [in:opt] fourcc of the video */
 } xvid_dec_create_t;
 
 
@@ -488,7 +492,8 @@
 extern xvid_plugin_func xvid_plugin_psnr;	/* write psnr values to stdout */
 extern xvid_plugin_func xvid_plugin_dump;	/* dump before and after yuvpgms */
 
-extern xvid_plugin_func xvid_plugin_ssim;	/*write ssim values to stdout*/
+extern xvid_plugin_func xvid_plugin_ssim;	    /*write ssim values to stdout*/
+extern xvid_plugin_func xvid_plugin_psnrhvsm;	/*write psnrhvsm values to stdout*/
 
 
 /* single pass rate control
@@ -559,6 +564,12 @@
 
 } xvid_plugin_ssim_t;
 
+typedef struct {
+        int version;
+
+        int method;      /* [in] masking method to apply. 0 for luminance masking, 1 for variance masking */
+} xvid_plugin_lumimasking_t;
+
 /*****************************************************************************
  *                             ENCODER API
  ****************************************************************************/
@@ -756,6 +767,9 @@
 	/* ---------------------------------------------- */
 
 	void *handle;                /* [out] encoder instance handle */
+
+	/* ------- v1.3.x ------- */
+	int start_frame_num;         /* [in:opt] frame number of start frame relative to zones definitions. allows to encode sub-sequences */
 } xvid_enc_create_t;