RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
wm4 2012-03-14 10:29:35 +01:00
parent 7608a0fac9
commit 0eb21226cb
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mpcommon.c
View File

@ -18,4 +18,4 @@
#include "version.h"
const char *mplayer_version = "MPlayer " VERSION;
const char *mplayer_version = "mplayer2 " VERSION;

8
mplayer.c
View File

@ -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__)
{

2
version.sh
View File

@ -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