[Mplayer-cvslog] CVS: main/libvo vo_vesa.c,1.47,1.48

Nick Kurshev nick at mplayer.dev.hu
Sun Nov 18 10:46:14 CET 2001


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

Modified Files:
	vo_vesa.c 
Log Message:
Unknown subdevice now is error (was - warning)

Index: vo_vesa.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_vesa.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- vo_vesa.c	17 Nov 2001 16:11:48 -0000	1.47
+++ vo_vesa.c	18 Nov 2001 09:46:11 -0000	1.48
@@ -408,7 +408,7 @@
    if(strcmp(sd,"dga") == 0)   { flags &= ~(SUBDEV_NODGA); flags |= SUBDEV_FORCEDGA; }
    else
    if(memcmp(sd,"lvo:",4) == 0) lvo_name = &sd[4]; /* lvo_name will be valid within init() */
-   else if(verbose) printf("vo_vesa: Unknown subcommand: %s\n", sd);
+   else { printf("vo_vesa: Unknown subdevice: %s\n", sd); return -1; }
    return flags;
 }
 
@@ -544,6 +544,7 @@
 	rgb2rgb_fnc = NULL;
         sd_flags = 0;
         if(vo_subdevice) sd_flags = parseSubDevice(vo_subdevice);
+	if(sd_flags == -1) return -1;
 	if(flags & 0x8)
 	{
 	  printf("vo_vesa: switch -flip is not supported\n");




More information about the MPlayer-cvslog mailing list