[Mplayer-cvslog] CVS: main/libvo mga_common.c,1.53,1.54

[Richard Felker CVS]

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv23460/libvo

Modified Files:
	mga_common.c 
Log Message:
100l to Gabu, this caused divide-by-zero with -vo mga. Apparently
someone only tested -vo xmga. Feel free to reenable if you can fix the
sigfpe properly.


Index: mga_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/mga_common.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- mga_common.c	26 Mar 2003 11:51:40 -0000	1.53
+++ mga_common.c	29 Mar 2003 19:56:31 -0000	1.54
@@ -27,7 +27,7 @@
 
 static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
     uint32_t bespitch = (mga_vid_config.src_width + 31) & ~31;
-    x0+=mga_vid_config.src_width*(vo_panscan_x>>1)/(vo_dwidth+vo_panscan_x);
+//    x0+=mga_vid_config.src_width*(vo_panscan_x>>1)/(vo_dwidth+vo_panscan_x);
     switch(mga_vid_config.format){
     case MGA_VID_FORMAT_YV12:
     case MGA_VID_FORMAT_IYUV:
@@ -45,7 +45,8 @@
 
 static void draw_osd(void)
 {
-    vo_draw_text(mga_vid_config.src_width-mga_vid_config.src_width*vo_panscan_x/(vo_dwidth+vo_panscan_x),mga_vid_config.src_height,draw_alpha);
+    vo_draw_text(mga_vid_config.src_width,mga_vid_config.src_height,draw_alpha);
+//    vo_draw_text(mga_vid_config.src_width-mga_vid_config.src_width*vo_panscan_x/(vo_dwidth+vo_panscan_x),mga_vid_config.src_height,draw_alpha);
 }