[Mplayer-cvslog] CVS: main/libvo vo_xover.c,1.3,1.4 vo_zr.c,1.26,1.27

[Alex Beregszaszi]

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

Modified Files:
	vo_xover.c vo_zr.c 
Log Message:
1000l

Index: vo_xover.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xover.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vo_xover.c	3 Aug 2003 17:26:25 -0000	1.3
+++ vo_xover.c	29 Aug 2003 21:42:51 -0000	1.4
@@ -33,8 +33,6 @@
 #include "aspect.h"
 #include "mp_msg.h"
 
-#include "../mplayer.h" /* exit_player() */
-
 #ifdef HAVE_NEW_GUI
 #include "../Gui/interface.h"
 #endif
@@ -424,11 +422,11 @@
       break;
   }
   if(!video_out_drivers[i]) {
-    mp_msg(MSGT_VO, MSGL_ERR, "VO XOverlay: Subdriver %s not found\n");
+    mp_msg(MSGT_VO, MSGL_ERR, "VO XOverlay: Subdriver %s not found\n", arg);
     return 1;
   }
   if(video_out_drivers[i]->control(VOCTRL_XOVERLAY_SUPPORT,NULL) != VO_TRUE) {
-    mp_msg(MSGT_VO, MSGL_ERR, "VO XOverlay: %s doesn't support XOverlay\n");
+    mp_msg(MSGT_VO, MSGL_ERR, "VO XOverlay: %s doesn't support XOverlay\n", arg);
     return 1;
   }
   // X11 init

Index: vo_zr.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_zr.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- vo_zr.c	14 Aug 2003 01:24:17 -0000	1.26
+++ vo_zr.c	29 Aug 2003 21:42:51 -0000	1.27
@@ -175,7 +175,7 @@
 	}
 	
 	if (ioctl(zr->vdes, VIDIOCGCAP, &zr->vc) < 0) {
-		mp_msg(MSGT_VO, MSGL_ERR, "zr: error getting video capabilities from %s\n");
+		mp_msg(MSGT_VO, MSGL_ERR, "zr: error getting video capabilities from %s\n", dev);
 		return 1;
 	}
 	mp_msg(MSGT_VO, MSGL_V, "zr: MJPEG card reports maxwidth=%d, maxheight=%d\n", zr->vc.maxwidth, zr->vc.maxheight);