--- xvid.h	2003/12/18 02:53:30	1.27.2.56
+++ xvid.h	2003/12/20 22:20:54	1.27.2.60
@@ -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.27.2.56 2003/12/18 02:53:30 Isibaar Exp $
+ * $Id: xvid.h,v 1.27.2.60 2003/12/20 22:20:54 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -105,6 +105,7 @@
 #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 */
+#define XVID_CSP_ARGB     (1<<15) /* 32-bit argb packed */
 #define XVID_CSP_BGR      (1<< 9) /* 24-bit bgr packed */
 #define XVID_CSP_RGB555   (1<<10) /* 16-bit rgb555 packed */
 #define XVID_CSP_RGB565   (1<<11) /* 16-bit rgb565 packed */
@@ -248,7 +249,7 @@
 #define XVID_DISCONTINUITY (1<<1) /* indicates break in stream */
 #define XVID_DEBLOCKY      (1<<2) /* perform luma deblocking */
 #define XVID_DEBLOCKUV     (1<<3) /* perform chroma deblocking */
-#define XVID_FILMEFFECT	   (1<<4) /* adds film grain */
+#define XVID_FILMEFFECT    (1<<4) /* adds film grain */
 
 typedef struct {
 	int version;
@@ -645,6 +646,7 @@
 #define XVID_ME_CHROMA_PVOP           (1<<12) /* also use chroma for P_VOP/S_VOP ME */
 #define XVID_ME_CHROMA_BVOP           (1<<13) /* also use chroma for B_VOP ME */
 #define XVID_ME_FASTREFINE16		  (1<<25) /* use low-complexity refinement functions */
+#define XVID_ME_FASTREFINE8           (1<<29) /* low-complexity 8x8 sub-block refinement */
 
 /* Rate Distortion based flags
  * Valid when XVID_VOP_MODEDECISION_BITS is enabled */
@@ -657,8 +659,10 @@
 
 /* Other */
 #define XVID_ME_DETECT_STATIC_MOTION  (1<<24) /* speed-up ME by detecting stationary scenes */
-#define XVID_ME_SKIP_DELTASEARCH	  (1<<26) /* speed-up by skipping b-frame delta search */
+#define XVID_ME_SKIP_DELTASEARCH      (1<<26) /* speed-up by skipping b-frame delta search */
 #define XVID_ME_FAST_MODEINTERPOLATE  (1<<27) /* speed-up by partly skipping interpolate mode */
+#define XVID_ME_BFRAME_EARLYSTOP      (1<<28) /* speed-up by early exiting b-search */
+
 /* Unused */
 #define XVID_ME_UNRESTRICTED16        (1<<20) /* unrestricted ME, not implemented */
 #define XVID_ME_OVERLAPPING16         (1<<21) /* overlapping ME, not implemented */