--- trunk/xvidcore/src/xvid.h	2010/11/28 15:19:07	1909
+++ branches/release-1_3-branch/xvidcore/src/xvid.h	2011/05/18 09:02:35	1985
@@ -3,7 +3,7 @@
  * XVID MPEG-4 VIDEO CODEC
  * - Xvid Main header file -
  *
- *  Copyright(C) 2001-2010 Peter Ross <pross@xvid.org>
+ *  Copyright(C) 2001-2011 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.71 2010-11-28 15:18:21 Isibaar Exp $
+ * $Id$
  *
  ****************************************************************************/
 
@@ -57,11 +57,9 @@
 #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,2)
 #define XVID_API                 XVID_MAKE_API(4, 3)
 
-#define XVID_UNSTABLE
-
 /* Bitstream Version
  * this will be writen into the bitstream to allow easy detection of xvid
  * encoder bugs in the decoder, without this it might not possible to
@@ -73,7 +71,7 @@
  * doesnt hurt but not increasing it could cause difficulty for decoders in the
  * future
  */
-#define XVID_BS_VERSION 58 
+#define XVID_BS_VERSION 64 
 
 /*****************************************************************************
  * error codes
@@ -246,7 +244,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;
 
 
@@ -746,7 +746,7 @@
 	int num_plugins;             /* [in:opt] number of plugins */
 	xvid_enc_plugin_t * plugins; /*          ^^ plugin array */
 
-	int num_threads;             /* [in:opt] number of threads */
+	int num_threads;             /* [in:opt] number of threads to use in encoder */
 	int max_bframes;             /* [in:opt] max sequential bframes (0=disable bframes) */
 
 	int global;                  /* [in:opt] global flags; controls encoding behavior */
@@ -772,6 +772,7 @@
 
 	/* ------- v1.3.x ------- */
 	int start_frame_num;         /* [in:opt] frame number of start frame relative to zones definitions. allows to encode sub-sequences */
+	int num_slices;              /* [in:opt] number of slices to code for each frame */
 } xvid_enc_create_t;