diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2011-01-26 20:42:15 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2011-01-26 20:42:15 +0200 |
| commit | f50f34245efa1012855a693558680bcfb7c348e5 (patch) | |
| tree | 76e8fc186a96fdc1106b5c634d5937e514a06037 /DOCS | |
| parent | ec55a188e4d0232acd50fcabc0a3db3be2b9538e (diff) | |
| parent | c9026cb3210205b07e2e068467a18ee40f9259a3 (diff) | |
| download | mpv-f50f34245efa1012855a693558680bcfb7c348e5.tar.bz2 mpv-f50f34245efa1012855a693558680bcfb7c348e5.tar.xz | |
Merge branch 'sub'
* sub:
sub/OSD: move some related files to sub/
subtitles: options: enable -ass by default
subtitles: change default libass rendering style
demux_mkv, chapters: change millisecond arithmetic to ns
cleanup: rename ass_* functions to mp_ass_*
subs: use correct font aspect ratio for libass + converted subs
cleanup: some random minor code simplification and cleanup
vf_vo: fix EOSD change detection bug
sd_ass: remove subreader use, support plaintext markup
subtitles: style support for common SubRip tags and MicroDVD
core: ordered chapters: fix bad subtitle parameter
subs/demux: don't try to enable sub track when creating it
subtitles/demux: store duration instead of endpts in demux packets
subtitles: add framework for subtitle decoders
options: add special -leak-report option
subtitles: remove code trying to handle text subs with libavcodec
cleanup: move MP_NOPTS_VALUE definition to mpcommon.h
subtitles: move global ass_track to struct osd_state
core: move most mpcommon.c contents to mplayer.c
core: move global "subdata" and "vo_sub_last" to mpctx
subtitles: remove sub_last_pts hack
options: move -noconfig to option struct, simplify
Diffstat (limited to 'DOCS')
| -rw-r--r-- | DOCS/man/en/mplayer.1 | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index cc5f912053..ae13cac060 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -2088,14 +2088,17 @@ FIXME: Document this. Also see \-vf expand. . .TP -.B \-ass (FreeType only) -Turn on SSA/ASS subtitle rendering. -With this option, libass will be used for SSA/ASS -external subtitles and Matroska tracks. +.B \-ass, \-noass (FreeType only) +Use libass to render all text subtitles. +This enables support for the native styling of SSA/ASS subtitles, +and also support for some styling features in other subtitle formats by +conversion to ASS markup. +Enabled by default if the player was compiled with libass support. .br .I NOTE: -Unlike normal OSD, libass uses fontconfig by default. To disable it, use -\-nofontconfig. +Some of the other subtitle options were written for the old non-libass +subtitle rendering system and may not work the same way or at all with +libass rendering enabled. . .TP .B \-ass\-border\-color <value> @@ -2272,13 +2275,8 @@ With Fontconfig, this option determines the Fontconfig font pattern. .PD 1 . .TP -.B \-fontconfig (fontconfig only) -Enables the usage of fontconfig managed fonts. -.br -.I NOTE: -By default fontconfig is used for libass-rendered subtitles and not used for -OSD. With \-fontconfig it is used for both libass and OSD, with \-nofontconfig -it is not used at all. +.B \-fontconfig, \-nofontconfig (fontconfig only) +Enables the use of fontconfig managed fonts. Enabled by default. . .TP .B \-forcedsubsonly |