[Mplayer-cvslog] CVS: main/libvo mga_common.c,1.44,1.45 vo_png.c,1.20,1.21 vo_xv.c,1.119,1.120 vosub_vidix.c,1.54,1.55

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv32125

Modified Files:
	mga_common.c vo_png.c vo_xv.c vosub_vidix.c 
Log Message:
also set VFCAP_ACCEPT_STRIDE when draw_image() is implemented


Index: mga_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/mga_common.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- mga_common.c	9 Oct 2002 14:38:38 -0000	1.44
+++ mga_common.c	10 Oct 2002 00:09:34 -0000	1.45
@@ -189,7 +189,7 @@
     case IMGFMT_IYUV:
     case IMGFMT_YUY2:
     case IMGFMT_UYVY:
-        return 3 | VFCAP_OSD|VFCAP_HWSCALE_UP|VFCAP_HWSCALE_DOWN;
+        return 3 | VFCAP_OSD|VFCAP_HWSCALE_UP|VFCAP_HWSCALE_DOWN|VFCAP_ACCEPT_STRIDE;
     }
     return 0;
 }

Index: vo_png.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_png.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- vo_png.c	10 Oct 2002 00:04:25 -0000	1.20
+++ vo_png.c	10 Oct 2002 00:09:34 -0000	1.21
@@ -284,10 +284,10 @@
     case IMGFMT_IYUV:
     case IMGFMT_I420:
     case IMGFMT_YV12:
-	return VFCAP_CSP_SUPPORTED|VFCAP_OSD;
+	return VFCAP_CSP_SUPPORTED|VFCAP_OSD|VFCAP_ACCEPT_STRIDE;
     case IMGFMT_RGB|24:
     case IMGFMT_BGR|24:
-        return VFCAP_CSP_SUPPORTED|VFCAP_CSP_SUPPORTED_BY_HW;
+        return VFCAP_CSP_SUPPORTED|VFCAP_CSP_SUPPORTED_BY_HW|VFCAP_ACCEPT_STRIDE;
     }
     return 0;
 }

Index: vo_xv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- vo_xv.c	9 Oct 2002 21:26:16 -0000	1.119
+++ vo_xv.c	10 Oct 2002 00:09:34 -0000	1.120
@@ -698,7 +698,7 @@
 
 static uint32_t query_format(uint32_t format)
 {
-    int flag=3|VFCAP_HWSCALE_UP|VFCAP_HWSCALE_DOWN|VFCAP_OSD; // FIXME! check for DOWN
+    int flag=3|VFCAP_HWSCALE_UP|VFCAP_HWSCALE_DOWN|VFCAP_OSD|VFCAP_ACCEPT_STRIDE; // FIXME! check for DOWN
    /* check image formats */
      if(format==IMGFMT_BGR24){ format=IMGFMT_YV12;flag&=~2;flag|=VFCAP_FLIP;} // conversion!
      for(i = 0; i < formats; i++){

Index: vosub_vidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- vosub_vidix.c	9 Oct 2002 21:54:58 -0000	1.54
+++ vosub_vidix.c	10 Oct 2002 00:09:34 -0000	1.55
@@ -353,7 +353,7 @@
   vdlQueryFourcc(vidix_handler,&vidix_fourcc);
   if (vidix_fourcc.depth == VID_DEPTH_NONE)
     return 0;
-  return VFCAP_CSP_SUPPORTED|VFCAP_CSP_SUPPORTED_BY_HW|VFCAP_HWSCALE_UP|VFCAP_HWSCALE_DOWN|VFCAP_OSD;
+  return VFCAP_CSP_SUPPORTED|VFCAP_CSP_SUPPORTED_BY_HW|VFCAP_HWSCALE_UP|VFCAP_HWSCALE_DOWN|VFCAP_OSD|VFCAP_ACCEPT_STRIDE;
 }
 
 int vidix_grkey_support(void)