[Mplayer-cvslog] CVS: main/libvo vo_svga.c,1.69,1.70
Ivan Kalvachev CVS
iive at mplayerhq.hu
Thu Sep 25 03:49:12 CEST 2003
Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv31851
Modified Files:
vo_svga.c
Log Message:
OSD stride fix and correct email
Index: vo_svga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_svga.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- vo_svga.c 21 Sep 2003 23:59:49 -0000 1.69
+++ vo_svga.c 25 Sep 2003 01:48:47 -0000 1.70
@@ -99,7 +99,7 @@
static vo_info_t info = {
"SVGAlib",
"svga",
- "Ivan Kalvachev <iive at sf.net>",
+ "Ivan Kalvachev <iive at users.sf.net>",
""
};
@@ -645,7 +645,6 @@
static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src,
unsigned char *srca, int stride) {
char* base;
- int bytelen;
if(verbose>2)
printf("vo_svga: draw_alpha(x0=%d,y0=%d,w=%d,h=%d,src=%p,srca=%p,stride=%d\n",
@@ -659,19 +658,18 @@
if(verbose>3)
printf("vo_svga: OSD draw in page %d\n",cpage);
base=PageStore[cpage].vbase + y0*mode_stride + x0*modeinfo->bytesperpixel;
- bytelen = modeinfo->width * modeinfo->bytesperpixel;
switch (mode_bpp) {
case 32:
- vo_draw_alpha_rgb32(w, h, src, srca, stride, base, bytelen);
+ vo_draw_alpha_rgb32(w, h, src, srca, stride, base, mode_stride);
break;
case 24:
- vo_draw_alpha_rgb24(w, h, src, srca, stride, base, bytelen);
+ vo_draw_alpha_rgb24(w, h, src, srca, stride, base, mode_stride);
break;
case 16:
- vo_draw_alpha_rgb16(w, h, src, srca, stride, base, bytelen);
+ vo_draw_alpha_rgb16(w, h, src, srca, stride, base, mode_stride);
break;
case 15:
- vo_draw_alpha_rgb15(w, h, src, srca, stride, base, bytelen);
+ vo_draw_alpha_rgb15(w, h, src, srca, stride, base, mode_stride);
break;
}
}
More information about the MPlayer-cvslog
mailing list