mirror of https://github.com/mpv-player/mpv
3289be9a28
The default style is added by mp_ass_default_track(), but not by ass_new_track(). Considering this, the previous condition at this point didn't make much sense anymore: the actual (converted) subtitle format doesn't matter much for what styling should be applied. What matters is if the subtitle was originally ASS, or if it was converted to it. Change the code such that the default style is added if there aren't any, even after reading sub extradata. (The extradata contains the ASS header, including the style section.) This might change behavior with scripts that don't define any styles. The change is either with this commit or with an earlier commit in this branch, depending on the situation - there are multiple places where default styles are added in libass API functions, and it's all a big mess. Other than with very old or broken files (where different behavior doesn't matter much), the current code should be pretty safe, though. |
||
|---|---|---|
| .. | ||
| ass_mp.c | ||
| ass_mp.h | ||
| dec_sub.c | ||
| dec_sub.h | ||
| draw_bmp.c | ||
| draw_bmp.h | ||
| find_subfiles.c | ||
| find_subfiles.h | ||
| img_convert.c | ||
| img_convert.h | ||
| osd_dummy.c | ||
| osd_font.otf | ||
| osd_libass.c | ||
| sd.h | ||
| sd_ass.c | ||
| sd_lavc.c | ||
| sd_lavc_conv.c | ||
| sd_microdvd.c | ||
| sd_movtext.c | ||
| sd_spu.c | ||
| sd_srt.c | ||
| spudec.c | ||
| spudec.h | ||
| sub.c | ||
| sub.h | ||
| subreader.c | ||
| subreader.h | ||