replace VO and VF numeric flags with #defined identifiers

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15213 b3059339-0415-0410-9bf9-f77b7e298cf2

36 files changed, 90 insertions, 94 deletions

diff --git a/libvo/mga_common.c b/libvo/mga_common.c
index 6adb31aa2e..1189e6a8f7 100644
--- a/libvo/mga_common.c
+++ b/libvo/mga_common.c
@@ -204,7 +204,7 @@ query_format(uint32_t format)
     case IMGFMT_IYUV:
     case IMGFMT_YUY2:
     case IMGFMT_UYVY:
-        return 3 | VFCAP_OSD|VFCAP_HWSCALE_UP|VFCAP_HWSCALE_DOWN|VFCAP_ACCEPT_STRIDE;
+        return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD|VFCAP_HWSCALE_UP|VFCAP_HWSCALE_DOWN|VFCAP_ACCEPT_STRIDE;
     }
     return 0;
 }
diff --git a/libvo/vesa_lvo.c b/libvo/vesa_lvo.c
index 8b914475b2..2ab2c0d798 100644
--- a/libvo/vesa_lvo.c
+++ b/libvo/vesa_lvo.c
@@ -27,6 +27,7 @@
 #include "fastmemcpy.h"
 #include "osd.h"
 #include "video_out.h"
+#include "libmpcodecs/vfcap.h"
 
 #define WIDTH_ALIGN 32 /* should be 16 for rage:422 and 32 for rage:420 */
 #define NUM_FRAMES 10
@@ -289,7 +290,7 @@ void     vlvo_draw_osd(void)
 uint32_t vlvo_query_info(uint32_t format)
 {
   if(verbose > 1) printf("vesa_lvo: query_format was called: %x (%s)\n",format,vo_format_name(format));
-  return 1;
+  return VFCAP_CSP_SUPPORTED;
 }
 
 uint32_t vlvo_control(uint32_t request, void *data, ...)
diff --git a/libvo/vo_aa.c b/libvo/vo_aa.c
index 1332bbe63e..e89f7e4855 100644
--- a/libvo/vo_aa.c
+++ b/libvo/vo_aa.c
@@ -229,7 +229,7 @@ printosdprogbar(){
 }
 static uint32_t
 config(uint32_t width, uint32_t height, uint32_t d_width,
-	    uint32_t d_height, uint32_t fullscreen, char *title, 
+	    uint32_t d_height, uint32_t flags, char *title, 
 	    uint32_t format) {
     /*
      * main init
diff --git a/libvo/vo_bl.c b/libvo/vo_bl.c
index 50ac0e41c0..e41874a8d9 100644
--- a/libvo/vo_bl.c
+++ b/libvo/vo_bl.c
@@ -214,7 +214,7 @@ static bl_properties_t bls[NO_BLS] = {
 	&udp_init, &udp_send, &udp_close } };
 
 static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, 
-	uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
+	uint32_t d_height, uint32_t flags, char *title, uint32_t format)
 {
 	void * ptr;
 
diff --git a/libvo/vo_caca.c b/libvo/vo_caca.c
index c23504fed0..05ee4fd57e 100644
--- a/libvo/vo_caca.c
+++ b/libvo/vo_caca.c
@@ -137,7 +137,7 @@ static int resize ()
 }
 
 static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
-	uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
+	uint32_t d_height, uint32_t flags, char *title, uint32_t format)
 {
     image_height = height;
     image_width = width;
diff --git a/libvo/vo_cvidix.c b/libvo/vo_cvidix.c
index a0f654122e..27393a5477 100644
--- a/libvo/vo_cvidix.c
+++ b/libvo/vo_cvidix.c
@@ -76,7 +76,7 @@ static uint32_t setup_vidix(){
 }
 
 static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,uint32_t d_height, uint32_t flags, char *title, uint32_t format){
-  vo_fs = flags & 0x01;
+  vo_fs = flags & VOFLAG_FULLSCREEN;
   if(!vo_config_count){
     if(vo_screenwidth && vo_screenheight){
       if(!vo_geometry)center=1;
diff --git a/libvo/vo_dfbmga.c b/libvo/vo_dfbmga.c
index fef596f552..dbb9848091 100644
--- a/libvo/vo_dfbmga.c
+++ b/libvo/vo_dfbmga.c
@@ -547,7 +547,7 @@ static void release_config( void )
 static uint32_t
 config( uint32_t width, uint32_t height,
         uint32_t d_width, uint32_t d_height,
-        uint32_t fullscreen,
+        uint32_t flags,
         char *title,
 	uint32_t format )
 {
@@ -735,7 +735,7 @@ config( uint32_t width, uint32_t height,
                out_height = screen_height;
 
           aspect_save_screenres( out_width, out_height );
-          aspect( &out_width, &out_height, (fullscreen & 0x01) ? A_ZOOM : A_NOZOOM );
+          aspect( &out_width, &out_height, (flags & VOFLAG_FULLSCREEN) ? A_ZOOM : A_NOZOOM );
 
           if (in_width != out_width ||
               in_height != out_height)
diff --git a/libvo/vo_dga.c b/libvo/vo_dga.c
index feabdc3aa8..5632e7f142 100644
--- a/libvo/vo_dga.c
+++ b/libvo/vo_dga.c
@@ -627,7 +627,7 @@ static uint32_t config(uint32_t width, uint32_t height,
     vo_dga_vp_width = mX;
     vo_dga_vp_height = mY;
 
-    if ((flags & 0x04) || (flags & 0x01))
+    if ((flags & VOFLAG_SWSCALE) || (flags & VOFLAG_FULLSCREEN))
     {                           /* -zoom or -fs */
         scale_dstW = (d_width + 7) & ~7;
         scale_dstH = d_height;
@@ -636,9 +636,9 @@ static uint32_t config(uint32_t width, uint32_t height,
         aspect_save_screenres(mX, mY);
         aspect_save_orig(scale_srcW, scale_srcH);
         aspect_save_prescale(scale_dstW, scale_dstH);
-        if (flags & 0x01)       /* -fs */
+        if (flags & VOFLAG_FULLSCREEN)       /* -fs */
             aspect(&scale_dstW, &scale_dstH, A_ZOOM);
-        else if (flags & 0x04)  /* -fs */
+        else if (flags & VOFLAG_SWSCALE)  /* -fs */
             aspect(&scale_dstW, &scale_dstH, A_NOZOOM);
         mp_msg(MSGT_VO, MSGL_INFO,
                "vo_dga: Aspect corrected size for SwScaler: %4d x %4d.\n",
diff --git a/libvo/vo_directfb2.c b/libvo/vo_directfb2.c
index 7f6b356546..1d60f79789 100644
--- a/libvo/vo_directfb2.c
+++ b/libvo/vo_directfb2.c
@@ -524,7 +524,7 @@ return DFENUM_OK;
 #define CONFIG_ERROR -1
 
 static uint32_t config(uint32_t s_width, uint32_t s_height, uint32_t d_width,
-		uint32_t d_height, uint32_t fullscreen, char *title,
+		uint32_t d_height, uint32_t flags, char *title,
 		uint32_t format)
 {
   /*
@@ -533,10 +533,10 @@ static uint32_t config(uint32_t s_width, uint32_t s_height, uint32_t d_width,
 
 // decode flags
 
-	int fs = fullscreen & 0x01;
-        int vm = fullscreen & 0x02;
-	int zoom = fullscreen & 0x04;
-	int flip = fullscreen & 0x08;
+	int fs = flags & VOFLAG_FULLSCREEN;
+        int vm = flags & VOFLAG_MODESWITCHING;
+	int zoom = flags & VOFLAG_SWSCALE;
+	int flip = flags & VOFLAG_FLIPPING;
 
 	DFBSurfaceDescription dsc;
         DFBResult             ret;
diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c
index 1cb333dee0..92ccc4028d 100644
--- a/libvo/vo_dxr3.c
+++ b/libvo/vo_dxr3.c
@@ -418,7 +418,7 @@ void calculate_cvals(unsigned long mask, int *shift, int *prec)
 	}
 }
 
-static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
+static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
 {
 	int tmp1, tmp2, size;
 	em8300_register_t reg;
diff --git a/libvo/vo_fbdev.c b/libvo/vo_fbdev.c
index 5764dfc239..ed3fd62193 100644
--- a/libvo/vo_fbdev.c
+++ b/libvo/vo_fbdev.c
@@ -797,11 +797,11 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
 		uint32_t format)
 {
 	struct fb_cmap *cmap;
-	int vm = flags & 0x02;
-	int zoom = flags & 0x04;
+	int vm = flags & VOFLAG_MODESWITCHING;
+	int zoom = flags & VOFLAG_SWSCALE;
 	int vt_fd;
 
-	fs = flags & 0x01;
+	fs = flags & VOFLAG_FULLSCREEN;
 
 	if(pre_init_err == -2)
 	{
diff --git a/libvo/vo_fbdev2.c b/libvo/vo_fbdev2.c
index 630139a6e7..7468e0bd4d 100644
--- a/libvo/vo_fbdev2.c
+++ b/libvo/vo_fbdev2.c
@@ -208,7 +208,7 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
 		uint32_t format)
 {
 	struct fb_cmap *cmap;
-	int fs = flags & 0x01;
+	int fs = flags & VOFLAG_FULLSCREEN;
 
 	out_width = width;
 	out_height = height;
diff --git a/libvo/vo_gif89a.c b/libvo/vo_gif89a.c
index 1842165d3d..bbe4f76f60 100644
--- a/libvo/vo_gif89a.c
+++ b/libvo/vo_gif89a.c
@@ -165,7 +165,7 @@ static uint32_t preinit(const char *arg)
 }
 
 static uint32_t config(uint32_t s_width, uint32_t s_height, uint32_t d_width,
-		uint32_t d_height, uint32_t fullscreen, char *title,
+		uint32_t d_height, uint32_t flags, char *title,
 		uint32_t format)
 {
 #ifdef HAVE_GIF_4
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c
index 3011a5ce74..4c03bbaec0 100644
--- a/libvo/vo_gl.c
+++ b/libvo/vo_gl.c
@@ -163,7 +163,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
 
 	aspect(&d_width,&d_height,A_NOZOOM);
 #ifdef X11_FULLSCREEN
-//        if( flags&0x01 ){ // (-fs)
+//        if( flags&VOFLAG_FULLSCREEN ){ // (-fs)
 //          aspect(&d_width,&d_height,A_ZOOM);
 //        }
 #endif
@@ -214,7 +214,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
       vo_x11_classhint( mDisplay,vo_window,"gl" );
       vo_hidecursor(mDisplay,vo_window);
 
-//      if ( flags&0x01 ) vo_x11_decoration( mDisplay,vo_window,0 );
+//      if ( flags&VOFLAG_FULLSCREEN ) vo_x11_decoration( mDisplay,vo_window,0 );
 	  XSelectInput(mDisplay, vo_window, StructureNotifyMask);
 	  /* Tell other applications about this window */
 	  XSetStandardProperties(mDisplay, vo_window, title, title, None, NULL, 0, &hint);
diff --git a/libvo/vo_jpeg.c b/libvo/vo_jpeg.c
index d1b0ef4ead..befda65ef2 100644
--- a/libvo/vo_jpeg.c
+++ b/libvo/vo_jpeg.c
@@ -144,7 +144,7 @@ void jpeg_mkdir(char *buf, int verbose) {
 /* ------------------------------------------------------------------------- */
 
 static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
-                       uint32_t d_height, uint32_t fullscreen, char *title,
+                       uint32_t d_height, uint32_t flags, char *title,
                        uint32_t format)
 {
     char buf[BUFLENGTH];
diff --git a/libvo/vo_md5sum.c b/libvo/vo_md5sum.c
index 4ad300ce74..ba8a6b6b3c 100644
--- a/libvo/vo_md5sum.c
+++ b/libvo/vo_md5sum.c
@@ -136,7 +136,7 @@ static uint32_t preinit(const char *arg)
  */
 
 static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
-                       uint32_t d_height, uint32_t fullscreen, char *title,
+                       uint32_t d_height, uint32_t flags, char *title,
                        uint32_t format)
 {
     if (vo_config_count > 0 ) { /* Already configured */
diff --git a/libvo/vo_mga.c b/libvo/vo_mga.c
index 9861c95ed2..ac87904cad 100644
--- a/libvo/vo_mga.c
+++ b/libvo/vo_mga.c
@@ -34,7 +34,7 @@ LIBVO_EXTERN(mga)
 
 #define FBDEV	"/dev/fb0"
 
-static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
+static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
 {
 
 //	if (f >= 0) mga_uninit();
@@ -60,7 +60,7 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32
 		aspect_save_prescale(d_width,d_height);
 		aspect_save_screenres(vo_screenwidth,vo_screenheight);
 	
-		if(fullscreen&0x01) { /* -fs */
+		if(fullscreen&VOFLAG_FULLSCREEN) { /* -fs */
 			aspect(&d_width,&d_height,A_ZOOM);
 			vo_fs = VO_TRUE;
 		} else {
diff --git a/libvo/vo_mpegpes.c b/libvo/vo_mpegpes.c
index 2abc8141c6..71173da049 100644
--- a/libvo/vo_mpegpes.c
+++ b/libvo/vo_mpegpes.c
@@ -81,7 +81,7 @@ static vo_info_t info =
 LIBVO_EXTERN (mpegpes)
 
 static uint32_t
-config(uint32_t s_width, uint32_t s_height, uint32_t width, uint32_t height, uint32_t fullscreen, char *title, uint32_t format)
+config(uint32_t s_width, uint32_t s_height, uint32_t width, uint32_t height, uint32_t flags, char *title, uint32_t format)
 {
 #ifdef HAVE_DVB
     switch(s_height){
@@ -368,7 +368,7 @@ static uint32_t draw_slice(uint8_t *srcimg[], int stride[], int w,int h,int x0,i
 static uint32_t
 query_format(uint32_t format)
 {
-    if(format==IMGFMT_MPEGPES) return 3|VFCAP_TIMER;
+    if(format==IMGFMT_MPEGPES) return VFCAP_CSP_SUPPORTED|VFCAP_CSP_SUPPORTED_BY_HW|VFCAP_TIMER;
     return 0;
 }
 
diff --git a/libvo/vo_null.c b/libvo/vo_null.c
index 97fa750fe7..20200ad97c 100644
--- a/libvo/vo_null.c
+++ b/libvo/vo_null.c
@@ -66,11 +66,11 @@ draw_frame(uint8_t *src[])
 static uint32_t
 query_format(uint32_t format)
 {
-    return 1;
+    return VFCAP_CSP_SUPPORTED;
 }
 
 static uint32_t
-config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
+config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
 {
 	image_width = width;
 	image_height = height;
diff --git a/libvo/vo_png.c b/libvo/vo_png.c
index 5173fbf64e..d28c4a1bec 100644
--- a/libvo/vo_png.c
+++ b/libvo/vo_png.c
@@ -41,7 +41,7 @@ struct pngdata {
 };
 
 static uint32_t
-config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
+config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
 {
     
 	    if(z_compression == 0) {
diff --git a/libvo/vo_pnm.c b/libvo/vo_pnm.c
index ebbc090cd7..47b123fe96 100644
--- a/libvo/vo_pnm.c
+++ b/libvo/vo_pnm.c
@@ -257,7 +257,7 @@ void pnm_mkdir(char *buf, int verbose) {
  */
 
 static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
-                       uint32_t d_height, uint32_t fullscreen, char *title,
+                       uint32_t d_height, uint32_t flags, char *title,
                        uint32_t format)
 {
     char buf[BUFLENGTH];
diff --git a/libvo/vo_sdl.c b/libvo/vo_sdl.c
index 8ced65e36d..4e596536f7 100644
--- a/libvo/vo_sdl.c
+++ b/libvo/vo_sdl.c
@@ -155,11 +155,6 @@ static void setenv(const char *name, const char *val, int _xx)
 #endif
 
 
-#define FS 0x01
-#define VM 0x02
-#define ZOOM 0x04
-#define FLIP 0x08  
-
 #ifdef SDL_ENABLE_LOCKS
 #define	SDL_OVR_LOCK(x)        if (SDL_LockYUVOverlay (priv->overlay)) { \
 				if(verbose) printf("SDL: Couldn't lock YUV overlay\n"); \
@@ -690,7 +685,7 @@ static void set_fullmode (int mode) {
  
 	/* if we haven't set a fullmode yet, default to the lowest res fullmode first */
 	/* But select a mode where the full video enter */
-	if(priv->X && priv->fulltype & FS) {
+	if(priv->X && priv->fulltype & VOFLAG_FULLSCREEN) {
 		screen_surface_w = priv->XWidth;
 		screen_surface_h = priv->XHeight;
 	}
@@ -726,7 +721,7 @@ static void set_fullmode (int mode) {
 
 	/* calculate new video size/aspect */
 	if(priv->mode == YUV) {
-        if(priv->fulltype&FS)
+        if(priv->fulltype&VOFLAG_FULLSCREEN)
 		aspect_save_screenres(priv->XWidth, priv->XHeight);
 
         aspect(&priv->dstwidth, &priv->dstheight, A_ZOOM);
@@ -868,28 +863,28 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
 	 */
 //      printf("SDL: flags are set to: %i\n", flags);
 //	printf("SDL: Width: %i Height: %i D_Width %i D_Height: %i\n", width, height, d_width, d_height);
-	if(flags&FLIP) {
+	if(flags&VOFLAG_FLIPPING) {
 		if(verbose) printf("SDL: using flipped video (only with RGB/BGR/packed YUV)\n");
 		priv->flip = 1; 
 	}
-	if(flags&FS) {
+	if(flags&VOFLAG_FULLSCREEN) {
 	  	if(verbose) printf("SDL: setting zoomed fullscreen without modeswitching\n");
 		printf("SDL: Info - please use -vm or -zoom to switch to best resolution.\n");
-		priv->fulltype = FS;
+		priv->fulltype = VOFLAG_FULLSCREEN;
 		set_fullmode(priv->fullmode);
           	/*if((priv->surface = SDL_SetVideoMode (d_width, d_height, priv->bpp, priv->sdlfullflags)))
 			SDL_ShowCursor(0);*/
 	} else	
-	if(flags&VM) {
+	if(flags&VOFLAG_MODESWITCHING) {
 	 	if(verbose) printf("SDL: setting zoomed fullscreen with modeswitching\n");
-		priv->fulltype = VM;
+		priv->fulltype = VOFLAG_MODESWITCHING;
 		set_fullmode(priv->fullmode);
           	/*if((priv->surface = SDL_SetVideoMode (d_width ? d_width : width, d_height ? d_height : height, priv->bpp, priv->sdlfullflags)))
 			SDL_ShowCursor(0);*/
 	} else
-	if(flags&ZOOM) {
+	if(flags&VOFLAG_SWSCALE) {
 	 	if(verbose) printf("SDL: setting zoomed fullscreen with modeswitching\n");
-		priv->fulltype = ZOOM;
+		priv->fulltype = VOFLAG_SWSCALE;
 		set_fullmode(priv->fullmode);
 	} 
         else {
@@ -904,7 +899,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
 		}
 		else {
 			if(verbose) printf("SDL: setting zoomed fullscreen with modeswitching\n");
-			priv->fulltype = ZOOM;
+			priv->fulltype = VOFLAG_SWSCALE;
 			set_fullmode(priv->fullmode);
 		}	
 	}
diff --git a/libvo/vo_svga.c b/libvo/vo_svga.c
index 62fd1b8780..e82252f2c4 100644
--- a/libvo/vo_svga.c
+++ b/libvo/vo_svga.c
@@ -399,7 +399,7 @@ static uint32_t control(uint32_t request, void *data, ...)
 // This function is called to init the video driver for specific mode
 //
 static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
-                       uint32_t d_height, uint32_t flags, char *title, 
+                       uint32_t d_height, uint32_t flags, char *title,
                        uint32_t format) {
   int32_t req_w = width;// (d_width > 0 ? d_width : width);
   int32_t req_h = height;// (d_height > 0 ? d_height : height);
@@ -408,7 +408,7 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
   
   uint32_t accflags;
   if(verbose)
-    printf("vo_svga: config(%i, %i, %i, %i, %08x, %s, %08x)\n", width, height, 
+    printf("vo_svga: config(%i, %i, %i, %i, %08x, %s, %08x)\n", width, height,
            d_width, d_height, flags, title, format);
 //Only RGB modes supported
   if (!IMGFMT_IS_RGB(format) && !IMGFMT_IS_BGR(format)) {assert(0);return -1;} 
diff --git a/libvo/vo_syncfb.c b/libvo/vo_syncfb.c
index 0ff4d98fe6..47a648e60c 100644
--- a/libvo/vo_syncfb.c
+++ b/libvo/vo_syncfb.c
@@ -342,12 +342,12 @@ query_format(uint32_t format)
     case IMGFMT_YV12:
 //    case IMGFMT_RGB|24:
 //    case IMGFMT_BGR|24:
-        return 1;
+        return VFCAP_CSP_SUPPORTED;
     }
     return 0;
 }
 
-static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
+static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
 {
 	uint_32 frame_size;
 
diff --git a/libvo/vo_tdfx_vid.c b/libvo/vo_tdfx_vid.c
index 99436500bb..7ac0956d90 100644
--- a/libvo/vo_tdfx_vid.c
+++ b/libvo/vo_tdfx_vid.c
@@ -214,7 +214,7 @@ query_format(uint32_t format)
   switch(format) {
   case IMGFMT_BGR8:
     if(tdfx_cfg.screen_format == TDFX_VID_FORMAT_BGR8)
-      return 3 | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_ACCEPT_STRIDE;
+      return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_ACCEPT_STRIDE;
     return 0;
   case IMGFMT_YUY2:
   case IMGFMT_UYVY:
@@ -226,19 +226,19 @@ query_format(uint32_t format)
   case IMGFMT_I420:
     if(tdfx_cfg.screen_format == TDFX_VID_FORMAT_BGR8)
       return 0;
-    return 3 | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_ACCEPT_STRIDE;
+    return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_ACCEPT_STRIDE;
   }
   return 0;
 }
 
 static uint32_t
-config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
+config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
 {
 
   if(tdfx_fd < 0)
     return 1;
   // When we are run as sub vo we must follow the size gaven to us
-  if(!(fullscreen & VOFLAG_XOVERLAY_SUB_VO)) {
+  if(!(flags & VOFLAG_XOVERLAY_SUB_VO)) {
     if(!vo_screenwidth)
       vo_screenwidth = tdfx_cfg.screen_width;
     if(!vo_screenheight)
@@ -248,7 +248,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
     aspect_save_prescale(d_width,d_height);
     aspect_save_screenres(vo_screenwidth,vo_screenheight);
     
-    if(fullscreen&0x01) { /* -fs */
+    if(flags&VOFLAG_FULLSCREEN) { /* -fs */
       aspect(&d_width,&d_height,A_ZOOM);
       vo_fs = VO_TRUE;
     } else {
diff --git a/libvo/vo_tga.c b/libvo/vo_tga.c
index b1c53ba759..0d6a60b776 100644
--- a/libvo/vo_tga.c
+++ b/libvo/vo_tga.c
@@ -178,7 +178,7 @@ static uint32_t draw_image(mp_image_t* mpi)
     return VO_TRUE;
 }
 
-static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
+static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
 {
     /* buffer for alpha */
     if(line_buff){ free(line_buff); line_buff=NULL; }
diff --git a/libvo/vo_vesa.c b/libvo/vo_vesa.c
index a9adc8301f..dce842f6a9 100644
--- a/libvo/vo_vesa.c
+++ b/libvo/vo_vesa.c
@@ -468,7 +468,7 @@ static uint32_t query_format(uint32_t format)
 #ifdef CONFIG_VIDIX
     if(vidix_name)return(vidix_query_fourcc(format));
 #endif
-    return 1 | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_ACCEPT_STRIDE; /* due new SwScale code */
+    return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_ACCEPT_STRIDE; /* due new SwScale code */
 }
 
 static void paintBkGnd( void )
@@ -634,12 +634,12 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
 	  return -1;
 	}
 	if(subdev_flags == 0xFFFFFFFFUL) return -1;
-	if(flags & 0x8)
+	if(flags & VOFLAG_FLIPPING)
 	{
 	  printf("vo_vesa: switch -flip is not supported\n");
 	}
-	if(flags & 0x04) use_scaler = 1;
-	if(flags & 0x01)
+	if(flags & VOFLAG_SWSCALE) use_scaler = 1;
+	if(flags & VOFLAG_FULLSCREEN)
 	{
 	  if(use_scaler) use_scaler = 2;
 	  else          fs_mode = 1;
diff --git a/libvo/vo_winvidix.c b/libvo/vo_winvidix.c
index dfe9910f77..d4a63b5d5b 100644
--- a/libvo/vo_winvidix.c
+++ b/libvo/vo_winvidix.c
@@ -179,7 +179,7 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,uint32_
     vo_dx=( vo_screenwidth - d_width ) / 2; vo_dy=( vo_screenheight - d_height ) / 2;    
     geometry(&vo_dx, &vo_dy, &d_width, &d_height, vo_screenwidth, vo_screenheight);
 
-    vo_fs = flags&0x01;
+    vo_fs = flags&VOFLAG_FULLSCREEN;
 
 
     aspect(&d_width, &d_height, A_NOZOOM);
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c
index dcf989c7bc..14c04cff49 100644
--- a/libvo/vo_x11.c
+++ b/libvo/vo_x11.c
@@ -293,13 +293,13 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
     vo_dwidth = d_width;
     vo_dheight = d_height;
 
-    if (flags & 0x03)
+    if (flags & (VOFLAG_FULLSCREEN|VOFLAG_MODESWITCHING))
         fullscreen = 1;
-    if (flags & 0x02)
+    if (flags & VOFLAG_MODESWITCHING)
         vm = 1;
-    if (flags & 0x08)
+    if (flags & VOFLAG_FLIPPING)
         Flip_Flag = 1;
-    zoomFlag = flags & 0x04;
+    zoomFlag = flags & VOFLAG_SWSCALE;
 
     int_pause = 0;
 // if(!fullscreen) zoomFlag=1; //it makes no sense to avoid zooming on windowd mode
@@ -690,10 +690,10 @@ static uint32_t query_format(uint32_t format)
         if (IMGFMT_BGR_DEPTH(format) <= 8)
             return 0;           // TODO 8bpp not yet fully implemented
         if (IMGFMT_BGR_DEPTH(format) == vo_depthonscreen)
-            return 3 | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_FLIP |
+            return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_FLIP |
                 VFCAP_ACCEPT_STRIDE;
         else
-            return 1 | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_FLIP |
+            return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_FLIP |
                 VFCAP_ACCEPT_STRIDE;
     }
 
@@ -709,7 +709,7 @@ static uint32_t query_format(uint32_t format)
         case IMGFMT_I420:
         case IMGFMT_IYUV:
         case IMGFMT_YV12:
-            return 1 | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_ACCEPT_STRIDE;
+            return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_ACCEPT_STRIDE;
     }
     return 0;
 }
diff --git a/libvo/vo_xmga.c b/libvo/vo_xmga.c
index 008e5a424c..a5f020667a 100644
--- a/libvo/vo_xmga.c
+++ b/libvo/vo_xmga.c
@@ -177,7 +177,7 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
     else
 #endif
     {
-        if (flags & 1)
+        if (flags & VOFLAG_FULLSCREEN)
             aspect(&dwidth, &dheight, A_ZOOM);
 
         XGetWindowAttributes(mDisplay, mRootWin, &attribs);
@@ -237,13 +237,13 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
                 XStoreName(mDisplay, vo_window, mTitle);
                 XMapWindow(mDisplay, vo_window);
 
-                if (flags & 1)
+                if (flags & VOFLAG_FULLSCREEN)
                     vo_x11_fullscreen();
 
 #ifdef HAVE_XINERAMA
                 vo_x11_xinerama_move(mDisplay, vo_window);
 #endif
-            } else if (!(flags & 1))
+            } else if (!(flags & VOFLAG_FULLSCREEN))
                 XMoveResizeWindow(mDisplay, vo_window, vo_dx, vo_dy,
                                   vo_dwidth, vo_dheight);
         }
@@ -254,7 +254,7 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
 
     }                           // !GUI
 
-    if ((flags & 1) && (!WinID))
+    if ((flags & VOFLAG_FULLSCREEN) && (!WinID))
     {
         vo_dx = 0;
         vo_dy = 0;
diff --git a/libvo/vo_xover.c b/libvo/vo_xover.c
index a5c2bea6bd..22457fc4da 100644
--- a/libvo/vo_xover.c
+++ b/