diff options
| -rw-r--r-- | DOCS/man/en/options.rst | 10 | ||||
| -rw-r--r-- | core/mplayer.c | 3 |
2 files changed, 5 insertions, 8 deletions
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index a609e5f472..f626f861f6 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -90,13 +90,11 @@ - ``--aspect=16:9`` or ``--aspect=1.7777`` --ass, --no-ass - Render ASS subtitles natively, and convert text subtitles in other formats - to ASS internally (enabled by default). + Render ASS subtitles natively (enabled by default). - If ``--no-ass`` is specified, all subtitles are converted to plain text - internally. All tags and style declarations are stripped and ignored. The - subtitle renderer uses the font style as specified by the ``--sub-text-`` - options instead. + If ``--no-ass`` is specified, all tags and style declarations are stripped + and ignored on display. The subtitle renderer uses the font style as + specified by the ``--sub-text-`` options instead. *NOTE*: Using ``--no-ass`` may lead to incorrect or completely broken rendering of ASS/SSA subtitles. It can sometimes be useful to forcibly diff --git a/core/mplayer.c b/core/mplayer.c index de23e97a49..353723930c 100644 --- a/core/mplayer.c +++ b/core/mplayer.c @@ -1061,8 +1061,7 @@ struct track *mp_add_subtitles(struct MPContext *mpctx, char *filename, // through sd_ass makes the code much simpler, as sd_ass can handle all // the weird special-cases. #ifdef CONFIG_ASS - if (opts->ass_enabled) - asst = mp_ass_read_stream(mpctx->ass_library, filename, opts->sub_cp); + asst = mp_ass_read_stream(mpctx->ass_library, filename, opts->sub_cp); if (!asst) subd = sub_read_file(filename, fps, &mpctx->opts); if (asst || subd) { |