summaryrefslogtreecommitdiffstats
path: root/vidix
diff options
context:
space:
mode:
authorfaust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-02-01 11:35:28 +0000
committerfaust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-02-01 11:35:28 +0000
commita4683513fefdf72233aa336c8641014d0a3fde92 (patch)
tree51d554e81d89e330f2c7dba7a66ab159c095b642 /vidix
parentb5b742579514a34ff945dde718624ede7adcd3a1 (diff)
downloadmpv-a4683513fefdf72233aa336c8641014d0a3fde92.tar.bz2
mpv-a4683513fefdf72233aa336c8641014d0a3fde92.tar.xz
1000l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11903 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'vidix')
-rw-r--r--vidix/drivers/nvidia_vid.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/vidix/drivers/nvidia_vid.c b/vidix/drivers/nvidia_vid.c
index 91d8945000..cf952fda40 100644
--- a/vidix/drivers/nvidia_vid.c
+++ b/vidix/drivers/nvidia_vid.c
@@ -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 @@ int vixConfigPlayback(vidix_playback_t *vinfo){
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;
}