[Mplayer-cvslog] CVS: main/libvo vo_svga.c,1.23,1.24

[Zoltan Mark Vician]

Update of /cvsroot/mplayer/main/libvo
In directory usw-pr-cvs1:/tmp/cvs-serv17951

Modified Files:
	vo_svga.c 
Log Message:



Index: vo_svga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_svga.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** vo_svga.c	2001/04/24 11:42:04	1.23
--- vo_svga.c	2001/04/24 12:21:42	1.24
***************
*** 23,26 ****
--- 23,27 ----
  
  #include "sub.h"
+ #include "osd.h"
  
  extern void rgb15to16_mmx(char* s0,char* d0,int count);
***************
*** 179,184 ****
  		     bpp = 32;
  		     bpp_conv = 1;
! 		     if (verbose)
! 		       printf("vo_svga: BPP conversion 24->32\n");
  		   }     
                 break;
--- 180,184 ----
  		     bpp = 32;
  		     bpp_conv = 1;
!                      printf("vo_svga: BPP conversion 24->32\n");
  		   }     
                 break;
***************
*** 197,202 ****
  		     bpp = 16;
  		     bpp_conv = 1;
! 		     if (verbose)
! 		       printf("vo_svga: BPP conversion 15->16\n");
  		   }
                 break;
--- 197,201 ----
  		     bpp = 16;
  		     bpp_conv = 1;
!                      printf("vo_svga: BPP conversion 15->16\n");
  		   }
                 break;
***************
*** 421,426 ****
  }
  
- #include "osd.h"
- 
  static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src,
                         unsigned char *srca, int stride) {
--- 420,423 ----
***************
*** 486,490 ****
    }
    gl_putbox(x_pos, y_pos, maxw, maxh, src[0]);
!   return 0;
  }
  
--- 483,488 ----
    }
    gl_putbox(x_pos, y_pos, maxw, maxh, src[0]);
!   
!   return (0);
  }
  
***************
*** 503,507 ****
    }
    gl_putbox((int)(x * scaling) + x_pos, (int)(y * scaling) + y_pos, sw, sh, src);
!   return 0;
  }
  
--- 501,506 ----
    }
    gl_putbox((int)(x * scaling) + x_pos, (int)(y * scaling) + y_pos, sw, sh, src);
! 
!   return (0);
  }
  
***************
*** 543,545 ****
    }
  }
! 	
--- 542,544 ----
    }
  }
! 	
\ No newline at end of file


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog