Mercurial > mplayer.hg

changeset 11902:6a49dea2c0e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
1000l
author faust3
date Sun, 01 Feb 2004 11:35:28 +0000
parents 01bfcbd73986
children 41f016f1cd66
files vidix/drivers/nvidia_vid.c
diffstat 1 files changed, 2 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/vidix/drivers/nvidia_vid.c	Sun Feb 01 10:58:50 2004 +0000
+++ b/vidix/drivers/nvidia_vid.c	Sun Feb 01 11:35:28 2004 +0000
@@ -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;
     }