diff options
| author | wm4 <wm4@mplayer2.org> | 2012-03-14 10:29:35 +0100 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-03-14 10:29:35 +0100 |
| commit | 0eb21226cbfdd200f2aea5d3a9db2cdbff4773a5 (patch) | |
| tree | 8ae284bc132817b75c6935e547fe7235197486fc | |
| parent | 7608a0fac9b9c99cc2975be1667df9c8625713dc (diff) | |
| download | mpv-0eb21226cbfdd200f2aea5d3a9db2cdbff4773a5.tar.bz2 mpv-0eb21226cbfdd200f2aea5d3a9db2cdbff4773a5.tar.xz | |
Use "mplayer2" in version string, not "MPlayer2"
The name "MPlayer2" isn't used anywhere. It's either "MPlayer" or
"mplayer2". Make it more consistent by using "mplayer2" instead.
Note that the version string passed as network user-agent changes from
"MPlayer" to "mplayer2" as well.
| -rw-r--r-- | mpcommon.c | 2 | ||||
| -rw-r--r-- | mplayer.c | 8 | ||||
| -rwxr-xr-x | version.sh | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/mpcommon.c b/mpcommon.c index 47c056a08e..95c21ead65 100644 --- a/mpcommon.c +++ b/mpcommon.c @@ -18,4 +18,4 @@ #include "version.h" -const char *mplayer_version = "MPlayer " VERSION; +const char *mplayer_version = "mplayer2 " VERSION; @@ -79,7 +79,6 @@ #include "sub/av_sub.h" #include "libmpcodecs/dec_teletext.h" #include "cpudetect.h" -#include "version.h" #ifdef CONFIG_X11 #include "libvo/x11_common.h" @@ -3899,9 +3898,10 @@ static int select_audio(demuxer_t *demuxer, int audio_id, char **audio_lang) return demuxer->audio->id; } -static void print_version(const char *name) +static void print_version(void) { - mp_msg(MSGT_CPLAYER, MSGL_INFO, MP_TITLE, name); + mp_msg(MSGT_CPLAYER, MSGL_INFO, + "%s (C) 2000-2012 MPlayer & mplayer2 teams\n", mplayer_version); /* Test for CPU capabilities (and corresponding OS support) for optimizing */ GetCpuCaps(&gCpuCaps); @@ -4031,7 +4031,7 @@ int main(int argc, char *argv[]) } } - print_version("MPlayer2"); + print_version(); #if defined(__MINGW32__) || defined(__CYGWIN__) { diff --git a/version.sh b/version.sh index 6f3be92639..73905f05fc 100755 --- a/version.sh +++ b/version.sh @@ -15,12 +15,10 @@ test $version || version=$git_revision NEW_REVISION="#define VERSION \"${version}${extra}\"" OLD_REVISION=$(head -n 1 version.h 2> /dev/null) -TITLE='#define MP_TITLE "%s "VERSION" (C) 2000-2012 MPlayer Team\n"' # Update version.h only on revision changes to avoid spurious rebuilds if test "$NEW_REVISION" != "$OLD_REVISION"; then cat <<EOF > version.h $NEW_REVISION -$TITLE EOF fi |