[Mplayer-cvslog] CVS: main/vidix/drivers nvidia_vid.c,1.21,1.22

[Sascha Sommer CVS]

CVS change done by Sascha Sommer CVS

Update of /cvsroot/mplayer/main/vidix/drivers
In directory mail:/var2/tmp/cvs-serv19504/vidix/drivers

Modified Files:
	nvidia_vid.c 
Log Message:
1000l

Index: nvidia_vid.c
===================================================================
RCS file: /cvsroot/mplayer/main/vidix/drivers/nvidia_vid.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- nvidia_vid.c	30 Jan 2004 20:10:31 -0000	1.21
+++ nvidia_vid.c	1 Feb 2004 11:35:28 -0000	1.22
@@ -1,6 +1,6 @@
 /*
    nvidia_vid - VIDIX based video driver for NVIDIA chips
-   Copyrights 2003 Sascha Sommer. This file is based on sources from
+   Copyrights 2003 - 2004 Sascha Sommer. This file is based on sources from
    RIVATV (rivatv.sf.net)
    Licence: GPL
    WARNING: THIS DRIVER IS IN BETA STAGE
@@ -852,20 +852,7 @@
 		    vinfo->offset.y = 0;
 		    vinfo->offset.v = 0;
 		    vinfo->offset.u = 0;
-
-		    info->pitch = info->width << 1;
-		    vinfo->frame_size = info->pitch * info->height;
-		    break;
-	    case IMGFMT_YV12:
-		    vinfo->dest.pitch.y = 1;
-		    vinfo->dest.pitch.u = 1;
-		    vinfo->dest.pitch.v = 1;
-
-		    vinfo->offset.y = 0;
-		    vinfo->offset.v = (info->width) * info->height;
-		    vinfo->offset.u = vinfo->offset.v * 5 / 4;
-
-		    info->pitch = info->width + (info->width >> 1);
+		    info->pitch = ((info->width << 1) + (vinfo->dest.pitch.y-1)) & ~(vinfo->dest.pitch.y-1);
 		    vinfo->frame_size = info->pitch * info->height;
 		    break;
     }