[Mplayer-cvslog] CVS: 0_90 mencoder.c,1.206,1.207 mplayer.c,1.683,1.684 version.sh,1.12,1.13

[Diego Biurrun CVS]

Update of /cvsroot/mplayer/0_90
In directory mail:/var/tmp.root/cvs-serv14607

Modified Files:
	mencoder.c mplayer.c version.sh 
Log Message:
Ported from main:
Copyright message reworked.


Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/0_90/mencoder.c,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- mencoder.c	20 May 2003 17:40:36 -0000	1.206
+++ mencoder.c	13 Jul 2003 22:22:54 -0000	1.207
@@ -27,11 +27,6 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-static char* banner_text=
-"\n\n"
-"MEncoder " VERSION MSGTR_MEncoderCopyright
-"\n";
-
 #include "cpudetect.h"
 
 #include "codec-cfg.h"
@@ -362,7 +357,7 @@
 
   mp_msg_init();
   mp_msg_set_level(MSGL_STATUS);
-  mp_msg(MSGT_CPLAYER,MSGL_INFO,"%s",banner_text);
+  mp_msg(MSGT_CPLAYER,MSGL_INFO, "MEncoder " VERSION " (C) 2000-2003 MPlayer Team\n\n");
 
   /* Test for cpu capabilities (and corresponding OS support) for optimizing */
   GetCpuCaps(&gCpuCaps);

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/0_90/mplayer.c,v
retrieving revision 1.683
retrieving revision 1.684
diff -u -r1.683 -r1.684
--- mplayer.c	9 Jul 2003 01:04:23 -0000	1.683
+++ mplayer.c	13 Jul 2003 22:22:54 -0000	1.684
@@ -1,5 +1,3 @@
-// Movie Player    v0.90   (C) 2000-2002. by A'rpi/ESP-team & `cat AUTHORS`
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -669,7 +667,7 @@
   mp_msg_init();
   mp_msg_set_level(MSGL_STATUS);
 
-  mp_msg(MSGT_CPLAYER,MSGL_INFO,banner_text);
+  mp_msg(MSGT_CPLAYER,MSGL_INFO, "MPlayer " VERSION " (C) 2000-2003 MPlayer Team\n");
   /* Test for cpu capabilities (and corresponding OS support) for optimizing */
   GetCpuCaps(&gCpuCaps);
 #ifdef ARCH_X86

Index: version.sh
===================================================================
RCS file: /cvsroot/mplayer/0_90/version.sh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- version.sh	9 Feb 2003 18:40:01 -0000	1.12
+++ version.sh	13 Jul 2003 22:22:54 -0000	1.13
@@ -28,4 +28,4 @@
 if test "$1" ; then
  extra="-$1"
 fi
-echo "#define VERSION \"0.90-CVS-${last_cvs_update}${extra} \"" >version.h
+echo "#define VERSION \"0.90-CVS-${last_cvs_update}${extra}\"" >version.h