diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-03-07 01:04:41 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-03-07 01:04:41 +0200 |
commit | e0172b96e3b6cc6a8b62ee5a52f780941a43de8b (patch) | |
tree | f652f6d15740667d5434e526db3fd12a0573aa0f /libass/ass.c | |
parent | 0c6f667896620943ee6ae899d6e36c3da5c98c54 (diff) | |
parent | 7e253f01715811e0c4f5f5b54317b098f2cd59d9 (diff) | |
download | mpv-e0172b96e3b6cc6a8b62ee5a52f780941a43de8b.tar.bz2 mpv-e0172b96e3b6cc6a8b62ee5a52f780941a43de8b.tar.xz |
Merge svn changes up to r28862
Diffstat (limited to 'libass/ass.c')
-rw-r--r-- | libass/ass.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libass/ass.c b/libass/ass.c index 8022dfc9be..612c8d6aae 100644 --- a/libass/ass.c +++ b/libass/ass.c @@ -347,6 +347,8 @@ void process_force_style(ass_track_t* track) { track->Timer = atof(token); else if(!strcasecmp(*fs, "WrapStyle")) track->WrapStyle = atoi(token); + else if(!strcasecmp(*fs, "ScaledBorderAndShadow")) + track->ScaledBorderAndShadow = parse_bool(token); dt = strrchr(*fs, '.'); if (dt) { @@ -520,6 +522,8 @@ static int process_info_line(ass_track_t* track, char *str) track->Timer = atof(str + 6); } else if (!strncmp(str,"WrapStyle:", 10)) { track->WrapStyle = atoi(str + 10); + } else if (!strncmp(str, "ScaledBorderAndShadow:", 22)) { + track->ScaledBorderAndShadow = parse_bool(str + 22); } return 0; } |