--- xvid.h	2010/11/16 14:42:07	1.70
+++ xvid.h	2010/12/18 10:13:30	1.72
@@ -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.70 2010/11/16 14:42:07 Isibaar Exp $
+ * $Id: xvid.h,v 1.72 2010/12/18 10:13:30 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -57,7 +57,7 @@
 #define XVID_API_MAJOR(a)        (((a)>>16) & 0xff)
 #define XVID_API_MINOR(a)        (((a)>> 0) & 0xff)
 
-#define XVID_VERSION             XVID_MAKE_VERSION(1,3,-127)
+#define XVID_VERSION             XVID_MAKE_VERSION(1,3,-63)
 #define XVID_API                 XVID_MAKE_API(4, 3)
 
 #define XVID_UNSTABLE
@@ -73,7 +73,7 @@
  * doesnt hurt but not increasing it could cause difficulty for decoders in the
  * future
  */
-#define XVID_BS_VERSION 57 
+#define XVID_BS_VERSION 58 
 
 /*****************************************************************************
  * error codes
@@ -246,7 +246,9 @@
 	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 */
+/* ------- v1.3.x ------- */
+	int fourcc;     /* [in:opt] fourcc of the input video */
+	int num_threads;/* [in:opt] number of threads to use in decoder */
 } xvid_dec_create_t;
 
 
@@ -370,7 +372,6 @@
 #define XVID_REQDQUANTS  (1<<2) /* plugin requires access to the dquant table */
 #define XVID_REQLAMBDA   (1<<3) /* plugin requires access to the lambda table */
 
-
 typedef struct
 {
 	int version;
@@ -669,6 +670,7 @@
 #define XVID_VOP_MODEDECISION_RD      (1<< 8) /* enable DCT-ME and use it for mode decision */
 #define XVID_VOP_FAST_MODEDECISION_RD (1<<12) /* use simplified R-D mode decision */
 #define XVID_VOP_RD_BVOP              (1<<13) /* enable rate-distortion mode decision in b-frames */
+#define XVID_VOP_RD_PSNRHVSM          (1<<14) /* use PSNR-HVS-M as metric for rate-distortion optimizations */
 
 /* Only valid for vol_flags|=XVID_VOL_INTERLACING */
 #define XVID_VOP_TOPFIELDFIRST        (1<< 9) /* set top-field-first flag  */