mirror of https://github.com/mpv-player/mpv
a75e65db5d
The subreader.c ASS parser (used when playing an external ASS subtitle file with --no-ass for "plaintext" display) hardcodes dialogue line syntax instead of correctly reading it from the "Format: " line in the file, but tried to support a varying amount of fields by guessing where the text field (which should be last) begins. This guessing code was buggy in many ways. Remove it and hardcode skipping 9 commas before the text field, which should work for most files. I don't consider the --no-ass case important enough to implement correct parsing now. Also fix the code removing formatting tags, which failed to remove the second in a pair of two consecutive tags. Conflicts: sub/subreader.c Merged from mplayer2 commit 91f516. Essentially reverts d5b964. |
||
|---|---|---|
| .. | ||
| ass_mp.c | ||
| ass_mp.h | ||
| dec_sub.c | ||
| dec_sub.h | ||
| draw_bmp.c | ||
| draw_bmp.h | ||
| find_sub.c | ||
| find_subfiles.c | ||
| find_subfiles.h | ||
| img_convert.c | ||
| img_convert.h | ||
| osd_dummy.c | ||
| osd_font.pfb | ||
| osd_libass.c | ||
| sd.h | ||
| sd_ass.c | ||
| sd_lavc.c | ||
| spudec.c | ||
| spudec.h | ||
| sub.c | ||
| sub.h | ||
| subassconvert.c | ||
| subassconvert.h | ||
| subreader.c | ||
| subreader.h | ||
| vobsub.c | ||
| vobsub.h | ||