--- xvid.h 2005/03/27 03:59:42 1.49 +++ xvid.h 2005/11/22 10:44:09 1.51.2.1 @@ -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.49 2005/03/27 03:59:42 suxen_drol Exp $ + * $Id: xvid.h,v 1.51.2.1 2005/11/22 10:44:09 suxen_drol Exp $ * ****************************************************************************/ @@ -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,1,-126) +#define XVID_VERSION XVID_MAKE_VERSION(1,1,0) #define XVID_API XVID_MAKE_API(4, 1) -#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 38 +#define XVID_BS_VERSION 40 /***************************************************************************** * error codes @@ -608,6 +606,7 @@ #define XVID_VOL_QUARTERPEL (1<<2) /* enable quarterpel: frames will encoded as quarterpel */ #define XVID_VOL_GMC (1<<3) /* enable GMC; frames will be checked for gmc suitability */ #define XVID_VOL_REDUCED_ENABLE (1<<4) /* enable reduced resolution vops: frames will be checked for rrv suitability */ + /* NOTE: the reduced resolution feature is not supported anymore. This flag will have no effect! */ #define XVID_VOL_INTERLACING (1<<5) /* enable interlaced encoding */ @@ -637,7 +636,7 @@ /* only valid for vol_flags|=XVID_VOL_REDUCED_ENABLED */ #define XVID_VOP_REDUCED (1<<11) /* reduced resolution vop */ - + /* NOTE: reduced resolution feature is not supported anymore. This flag will have no effect! */ /*---------------------------------------------------------------------------- * "Motion" flags