diff options
| author | Grigori Goronzy <greg@blackbox> | 2011-05-30 20:57:58 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-06-14 20:01:19 +0300 |
| commit | 378ada847c8eb3a641392691b1a2317f8fc214e0 (patch) | |
| tree | 9659d389e193a0b8854a7845dc3ec7f2c9c4325b /sub | |
| parent | 17db5cc98fcd13d010fb96c3b9ad06a4b4b20194 (diff) | |
| download | mpv-378ada847c8eb3a641392691b1a2317f8fc214e0.tar.bz2 mpv-378ada847c8eb3a641392691b1a2317f8fc214e0.tar.xz | |
sub/ass: use default style, not first style unconditionally
Turns out it's a bad idea to just always unconditionally use the first
style. Make mplayer2 use and set the style according to the track's
default_style property. Fixes the -ass-styles option broken with
recent libass versions (ticket #40).
Diffstat (limited to 'sub')
| -rw-r--r-- | sub/ass_mp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sub/ass_mp.c b/sub/ass_mp.c index 78f607bc7a..e1b0b07853 100644 --- a/sub/ass_mp.c +++ b/sub/ass_mp.c @@ -85,6 +85,7 @@ ASS_Track *mp_ass_default_track(ASS_Library *library) if (track->n_styles == 0) { track->Kerning = true; int sid = ass_alloc_style(track); + track->default_style = sid; ASS_Style *style = track->styles + sid; style->Name = strdup("Default"); style->FontName = (font_fontconfig >= 0 @@ -166,7 +167,7 @@ static int ass_process_subtitle(ASS_Track *track, subtitle *sub) event->Start = sub->start * 10; event->Duration = (sub->end - sub->start) * 10; - event->Style = 0; + event->Style = track->default_style; for (j = 0; j < sub->lines; ++j) len += sub->text[j] ? strlen(sub->text[j]) : 0; |