[Mplayer-cvslog] CVS: main/libvo vo_fbdev.c,1.6,1.7

[Szabolcs Berecz]

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

Modified Files:
	vo_fbdev.c 
Log Message:
alpha rendering, virtual screensize reset fix

Index: vo_fbdev.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_fbdev.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** vo_fbdev.c	2001/03/29 14:20:01	1.6
--- vo_fbdev.c	2001/03/29 17:59:21	1.7
***************
*** 172,176 ****
  		return 1;
  	}
- 	close(fb_dev_fd);
  
  	printf("fb_init: framebuffer @ %p\n", frame_buffer);
--- 172,175 ----
***************
*** 275,281 ****
  			for (x = 0; x < w; x++) {
  				if (srca[x]) {
! 					dst[0] = (dst[0]*(srca[x]^255)+src[x]*(srca[x]))>>8;
! 					dst[1] = (dst[1]*(srca[x]^255)+src[x]*(srca[x]))>>8;
! 					dst[2] = (dst[2]*(srca[x]^255)+src[x]*(srca[x]))>>8;
  				}
  				dst += fb_bpp / 8;
--- 274,280 ----
  			for (x = 0; x < w; x++) {
  				if (srca[x]) {
! 					dst[0]=((dst[0]*srca[x])>>8)+src[x];
! 					dst[1]=((dst[1]*srca[x])>>8)+src[x];
! 					dst[2]=((dst[2]*srca[x])>>8)+src[x];
  				}
  				dst += fb_bpp / 8;
***************
*** 341,344 ****
--- 340,344 ----
  	if (ioctl(fb_dev_fd, FBIOPUT_VSCREENINFO, &fb_var_info))
  		printf("vo_fbdev: Can't set virtual screensize to original value: %s\n", strerror(errno));
+ 	close(fb_dev_fd);
  	memset(next_frame, '\0', in_height * in_width * (fb_bpp / 8));
  	put_frame();


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