summaryrefslogtreecommitdiffstats
path: root/audio/decode
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2012-11-22 01:22:25 +0200
committerwm4 <wm4@nowhere>2012-12-03 21:08:52 +0100
commita75e65db5defc59a8fca0024bf6559b8b6c0f1ea (patch)
tree4c697b47720c715f7ac052b2b45c04bc94a580d8 /audio/decode
parent72205635abe7f240118658d934b5db871a184201 (diff)
downloadmpv-a75e65db5defc59a8fca0024bf6559b8b6c0f1ea.tar.bz2
mpv-a75e65db5defc59a8fca0024bf6559b8b6c0f1ea.tar.xz
subreader: fix some of ASS parser issues
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.
Diffstat (limited to 'audio/decode')
0 files changed, 0 insertions, 0 deletions