[Mplayer-cvslog] CVS: main/libvo vo_svga.c,1.62,1.63

[Ivan Kalvachev CVS]

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

Modified Files:
	vo_svga.c 
Log Message:
disable auto oldmethod, directrendering for linear modes only

Index: vo_svga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_svga.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- vo_svga.c	30 Jan 2003 09:15:09 -0000	1.62
+++ vo_svga.c	3 Feb 2003 01:15:45 -0000	1.63
@@ -457,9 +457,6 @@
     return(1); // error
   }
   
-  if(vid_mode<10 || vid_mode==145) {
-  	oldmethod=1;
-  }
   /* set 332 palette for 8 bpp */
   if(bpp==8){
     int i;
@@ -478,9 +475,12 @@
   BYTESPERPIXEL=(bpp+4)>>3;
     LINEWIDTH=vga_getmodeinfo(vid_mode)->linewidth;
 
-  if(oldmethod && (bpp==8 || bpp==4)) LINEWIDTH*=8;
+  if( (vid_mode<10 || vid_mode==145) && (bpp==8 || bpp==4)) LINEWIDTH*=8;
+  else
+    if(vga_getmodeinfo(vid_mode)->flags & CAPABLE_LINEAR)
+//  	  if (vga_version>0x1430)//remove this to get more speed (or black screen)
+		vga_setlinearaddressing();
   
-  if(!oldmethod || (bpp>8))vga_setlinearaddressing();
   if(oldmethod) {
      buffer=malloc(HEIGHT*LINEWIDTH);
      maxframes=0;
@@ -850,7 +850,8 @@
 	(mpi->height != image_height) */
     )
 	return(VO_FALSE);
-
+	if(!directrender)
+	  return (VO_FALSE);
 /*
     if (Flip_Flag)
     {