diff options
| author | wm4 <wm4@nowhere> | 2013-06-02 19:57:37 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-06-03 22:40:07 +0200 |
| commit | d5520d20b26e7363882e9f1ebce7a5524a12321b (patch) | |
| tree | 944cb65091de7552db2c1c28d66048dd1a216fb3 /core | |
| parent | 74e3ac8bf885dad5b6d33fc8d2c714dd91c18b47 (diff) | |
| download | mpv-d5520d20b26e7363882e9f1ebce7a5524a12321b.tar.bz2 mpv-d5520d20b26e7363882e9f1ebce7a5524a12321b.tar.xz | |
sub: use libass even if -no-ass is used
The -no-ass option used to disable all use of libass completely. This
doesn't work this way anymore, and the text subtitle path has an
inherent dependency on libass. Currently -no-ass does 3 things:
1. Strip tags and formatting on display, and use a separate renderer for
the result. (Which might be the terminal, or libass via OSD code.)
2. Not loading attached fonts from Matroska files.
3. Use subreader.c instead of libass for reading .ass files.
1. and 2. are ok and what the user (probably wants), but 3. doesn't
really make sense anymore. subreader.c reads .ass files just fine, but
then does some strange things to them (something about coalescing and
re-adding newlines?), leading to even more broken display with -no-ass.
Instead of fighting with subreader.c, just use libass as loader.
Diffstat (limited to 'core')
| -rw-r--r-- | core/mplayer.c | 3 |
1 files changed, 1 insertions, 2 deletions
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) { |