Mercurial > mplayer.hg

changeset 10718:e3727e92e9d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
1000l
author alex
date Fri, 29 Aug 2003 21:42:51 +0000
parents 3cf6b963d08b
children caec33353477
files Gui/cfg.c libvo/vo_xover.c libvo/vo_zr.c m_struct.c mplayer.c
diffstat 5 files changed, 6 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/Gui/cfg.c	Fri Aug 29 21:16:32 2003 +0000
+++ b/Gui/cfg.c	Fri Aug 29 21:42:51 2003 +0000
@@ -285,7 +285,7 @@
 	fprintf( f,"%s = \"%s\"\n",gui_opts[i].name, v);
 	free(v);
       } else if((int)v == -1)
-	mp_msg(MSGT_GPLAYER,MSGL_WARN,"Unable to save the %s option\n");
+	mp_msg(MSGT_GPLAYER,MSGL_WARN,"Unable to save the '%s' option\n", gui_opts[i].name);
     }
    fclose( f );
   }
--- a/libvo/vo_xover.c	Fri Aug 29 21:16:32 2003 +0000
+++ b/libvo/vo_xover.c	Fri Aug 29 21:42:51 2003 +0000
@@ -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
--- a/libvo/vo_zr.c	Fri Aug 29 21:16:32 2003 +0000
+++ b/libvo/vo_zr.c	Fri Aug 29 21:42:51 2003 +0000
@@ -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);
--- a/m_struct.c	Fri Aug 29 21:16:32 2003 +0000
+++ b/m_struct.c	Fri Aug 29 21:42:51 2003 +0000
@@ -24,7 +24,7 @@
   void* r;
 
   if(!st->defaults) {
-    mp_msg(MSGT_CFGPARSER, MSGL_ERR,"Struct %s need defaults\n");
+    mp_msg(MSGT_CFGPARSER, MSGL_ERR,"Struct %s needs defaults\n",st->name);
     return NULL;
   }
   // Check the struct fields
--- a/mplayer.c	Fri Aug 29 21:16:32 2003 +0000
+++ b/mplayer.c	Fri Aug 29 21:42:51 2003 +0000
@@ -3572,7 +3572,7 @@
 	len = vobsub_get_packet(vo_vobsub,sh_video->pts+sub_delay+next_frame_time,(void**)&packet,&timestamp);
 	if(len > 0) {
 	  timestamp -= (sh_video->pts + sub_delay - sh_video->timer)*90000;
-	  mp_dbg(MSGT_CPLAYER,MSGL_V,"\rVOB sub: len=%d v_pts=%5.3f v_timer=%5.3f sub=%5.3f ts=%d \n",len,sh_video->pts,sh_video->timer,timestamp / 90000.0);
+	  mp_dbg(MSGT_CPLAYER,MSGL_V,"\rVOB sub: len=%d v_pts=%5.3f v_timer=%5.3f sub=%5.3f ts=%d \n",len,sh_video->pts,sh_video->timer,timestamp / 90000.0,timestamp);
 	}
       }
     } else {