[Mplayer-cvslog] CVS: main/libvo vo_fbdev.c,1.20,1.21

[Szabolcs Berecz]

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

Modified Files:
	vo_fbdev.c 
Log Message:
some fixes

Index: vo_fbdev.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_fbdev.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** vo_fbdev.c	2001/04/12 22:04:36	1.20
--- vo_fbdev.c	2001/04/12 23:23:29	1.21
***************
*** 248,251 ****
--- 248,255 ----
  		} else if (!strcmp(token[0], "endmode")) {
  			/* NOTHING for now*/
+ 		} else if (!strcmp(token[0], "accel")) {
+ 			if (get_token(1) < 0)
+ 				goto err_out_parse_error;
+ 			/* NOTHING for now*/
  		} else if (!strcmp(token[0], "hsync")) {
  			if (get_token(1) < 0)
***************
*** 488,495 ****
  	if (fb_mode_name) {
  		if (parse_fbmode_cfg(fb_mode_cfgfile) < 0)
! 			return 1;
  		if (!(fb_mode = find_mode_by_name(fb_mode_name))) {
  			printf("fb: can't find requested video mode\n");
! 			return 1;
  		}
  		fb_switch_mode = 1;
--- 492,499 ----
  	if (fb_mode_name) {
  		if (parse_fbmode_cfg(fb_mode_cfgfile) < 0)
! 			goto err_out;
  		if (!(fb_mode = find_mode_by_name(fb_mode_name))) {
  			printf("fb: can't find requested video mode\n");
! 			goto err_out;
  		}
  		fb_switch_mode = 1;
***************
*** 500,504 ****
  				fb_mode_depth != 24 && fb_mode_depth != 32) {
  			printf("fb: can't switch to %d bpp\n", fb_mode_depth);
! 			return 1;
  		}
  	}
--- 504,508 ----
  				fb_mode_depth != 24 && fb_mode_depth != 32) {
  			printf("fb: can't switch to %d bpp\n", fb_mode_depth);
! 			goto err_out;
  		}
  	}
***************
*** 603,606 ****
--- 607,613 ----
  		free(cmap->blue);
  		free(cmap);
+ 		break;
+ 	case FB_VISUAL_PSEUDOCOLOR:
+ 		printf("fb: visual is FB_VISUAL_PSEUDOCOLOR. it's not tested!\n");
  		break;
  	default:


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