xserver-xorg-video-chips: Changes to 'upstream-unstable'

[Brice Goglin <bgoglin-guest@alioth.debian.org>]

 src/ct_video.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 242a378d6c0bead85b0b6e94f40c51849ba8f43b
Author: Petteri Aimonen <jpa@bfd.mail.kapsi.fi>
Date:   Fri Mar 16 21:39:54 2007 -0400

    Fix Xv with scaling
    
    Fixes Bug 10225

diff --git a/src/ct_video.c b/src/ct_video.c
index 19467d7..01b93ca 100644
--- a/src/ct_video.c
+++ b/src/ct_video.c
@@ -638,8 +638,8 @@ CHIPSDisplayVideo(
 	if (dblscan) 
 	    tmp = cPtr->VideoZoomMax >> 1;
 	if (drw_h > src_h)
-	    tmp = tmp * src_h / drw_h;
-	cPtr->writeMR(cPtr, 0x33, tmp);
+           tmp = 256 * src_h / drw_h;
+       cPtr->writeMR(cPtr, 0x33, tmp & 0xFC);
     }
     cPtr->writeMR(cPtr, 0x1F, m1f); 
     cPtr->writeMR(cPtr, 0x1E, m1e);