--- xvid.h 2006/10/11 13:55:32 1.56 +++ xvid.h 2009/05/25 08:09:23 1.63.2.3 @@ -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.56 2006/10/11 13:55:32 Skal Exp $ + * $Id: xvid.h,v 1.63.2.3 2009/05/25 08:09:23 Isibaar Exp $ * ****************************************************************************/ @@ -57,10 +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_UNSTABLE +#define XVID_VERSION XVID_MAKE_VERSION(1,2,2) +#define XVID_API XVID_MAKE_API(4, 2) /* Bitstream Version * this will be writen into the bitstream to allow easy detection of xvid @@ -73,7 +71,7 @@ * doesnt hurt but not increasing it could cause difficulty for decoders in the * future */ -#define XVID_BS_VERSION 45 +#define XVID_BS_VERSION 50 /***************************************************************************** * error codes @@ -102,6 +100,7 @@ #define XVID_CSP_YUY2 (1<< 3) /* 4:2:2 packed */ #define XVID_CSP_UYVY (1<< 4) /* 4:2:2 packed */ #define XVID_CSP_YVYU (1<< 5) /* 4:2:2 packed */ +#define XVID_CSP_RGB (1<<16) /* 24-bit rgb packed */ #define XVID_CSP_BGRA (1<< 6) /* 32-bit bgra packed */ #define XVID_CSP_ABGR (1<< 7) /* 32-bit abgr packed */ #define XVID_CSP_RGBA (1<< 8) /* 32-bit rgba packed */ @@ -169,6 +168,8 @@ #define XVID_CPU_MMXEXT (1<< 1) /* mmx-ext : pentium2, athlon */ #define XVID_CPU_SSE (1<< 2) /* sse : pentium3, athlonXP */ #define XVID_CPU_SSE2 (1<< 3) /* sse2 : pentium4, athlon64 */ +#define XVID_CPU_SSE3 (1<< 8) /* sse3 : pentium4, athlon64 */ +#define XVID_CPU_SSE41 (1<< 9) /* sse41: penryn */ #define XVID_CPU_3DNOW (1<< 4) /* 3dnow : k6-2 */ #define XVID_CPU_3DNOWEXT (1<< 5) /* 3dnow-ext : athlon */ #define XVID_CPU_TSC (1<< 6) /* tsc : Pentium */ @@ -549,6 +550,11 @@ /*visualize*/ int b_visualize; + /*accuracy 0 very accurate 4 very fast*/ + int acc; + + int cpu_flags; /* XVID_CPU_XXX flags */ + } xvid_plugin_ssim_t; /*****************************************************************************