diff options
| author | wm4 <wm4@nowhere> | 2012-10-16 07:30:30 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-10-16 07:30:30 +0200 |
| commit | 4e89851aa128a614f59ff4885af384a266cb24e6 (patch) | |
| tree | c6ab9f34ef3e9c1d58f8ec837b93e249e79bdcf6 /libmpdemux | |
| parent | f45eab6faea05834c1337175dbe51437707b8d7e (diff) | |
| parent | 6557f206efeb4569a42f1e4810172bc97fd64619 (diff) | |
| download | mpv-4e89851aa128a614f59ff4885af384a266cb24e6.tar.bz2 mpv-4e89851aa128a614f59ff4885af384a266cb24e6.tar.xz | |
Merge branch 'master' into osd_changes
Conflicts:
Makefile
command.c
libvo/gl_common.c
libvo/vo_corevideo.m
libvo/vo_opengl.c
libvo/vo_opengl_old.c
libvo/vo_opengl_shaders.glsl
sub/ass_mp.c
sub/osd_libass.c
sub/sd_ass.c
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_mkv.c | 2 |
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); |