summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mkv.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-10-11 02:04:08 +0200
committerwm4 <wm4@nowhere>2012-10-12 10:14:32 +0200
commit65fc530f0c3ff02f982a0e4c74988d4a53730f04 (patch)
treec1faf4915a2c1e4e1d593b41a42891f0d547022f /libmpdemux/demux_mkv.c
parent3d712eb56da9b9dccdef28fa1a3694c4d8fccd65 (diff)
downloadmpv-65fc530f0c3ff02f982a0e4c74988d4a53730f04.tar.bz2
mpv-65fc530f0c3ff02f982a0e4c74988d4a53730f04.tar.xz
Rename to "mpv"
This changes the name of this project to mpv. Most user-visible mentions of "MPlayer" and "mplayer" are changed to "mpv". The binary name and the default config file location are changed as well. The new default config file location is: ~/.mpv/ Remove etc/mplayer.desktop. Apparently this was for the MPlayer GUI, which has been removed from mplayer2 ages ago. We don't have a logo, and the MS Windows resource files sort-of require one, so leave etc/mplayer.ico/.xpm as-is. Remove the debian and rpm packaging scripts. These contained outdated dependencies and likely were more harmful than useful. (Patches which add working and well-tested packaging are welcome.)
Diffstat (limited to 'libmpdemux/demux_mkv.c')
-rw-r--r--libmpdemux/demux_mkv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index f1e41f5f6e..c93d67180e 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -470,7 +470,7 @@ static void parse_trackencodings(struct demuxer *demuxer,
else if (e.comp_algo == 0) {
mp_tmsg(MSGT_DEMUX, MSGL_WARN,
"[mkv] Track %u was compressed with zlib "
- "but mplayer has not been compiled\n"
+ "but mpv has not been compiled\n"
"[mkv] with support for zlib compression. "
"Skipping track.\n",
track->tnum);