diff options
| -rw-r--r-- | DOCS/man/en/mplayer.1 | 24 | ||||
| -rw-r--r-- | defaultopts.c | 4 |
2 files changed, 15 insertions, 13 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index b3ed31b0e7..4635dfcb30 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -2079,14 +2079,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> @@ -2263,13 +2266,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 diff --git a/defaultopts.c b/defaultopts.c index f42b6618b1..8f855e47ac 100644 --- a/defaultopts.c +++ b/defaultopts.c @@ -46,6 +46,10 @@ void set_default_mplayer_options(struct MPOpts *opts) .movie_aspect = -1., .flip = -1, .vd_use_slices = 1, +#ifdef CONFIG_ASS + .ass_enabled = 1, +#endif + .lavc_param = { .workaround_bugs = 1, // autodetect .error_resilience = 2, |