--- trunk/xvidcore/src/xvid.h 2008/11/14 15:43:28 1794 +++ trunk/xvidcore/src/xvid.h 2010/03/09 10:00:30 1883 @@ -1,7 +1,7 @@ /***************************************************************************** * * XVID MPEG-4 VIDEO CODEC - * - XviD Main header file - + * - Xvid Main header file - * * Copyright(C) 2001-2004 Peter Ross * @@ -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.61 2008-11-14 15:43:27 Isibaar Exp $ + * $Id: xvid.h,v 1.66 2010-03-09 10:00:14 Isibaar Exp $ * ****************************************************************************/ @@ -57,8 +57,8 @@ #define XVID_API_MAJOR(a) (((a)>>16) & 0xff) #define XVID_API_MINOR(a) (((a)>> 0) & 0xff) -#define XVID_VERSION XVID_MAKE_VERSION(1,2,-127) -#define XVID_API XVID_MAKE_API(4, 1) +#define XVID_VERSION XVID_MAKE_VERSION(1,3,-127) +#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 47 +#define XVID_BS_VERSION 56 /***************************************************************************** * error codes @@ -555,8 +555,16 @@ /*accuracy 0 very accurate 4 very fast*/ int acc; + int cpu_flags; /* XVID_CPU_XXX flags */ + } 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 ****************************************************************************/ @@ -754,6 +762,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;