diff options
author | Jan Ekström <jeebjp@gmail.com> | 2019-03-11 01:00:27 +0200 |
---|---|---|
committer | Jan Ekström <jeebjp@gmail.com> | 2019-03-11 01:00:27 +0200 |
commit | 199aabddcc0105b504cc8e0cb240bc3c89288c1a (patch) | |
tree | fa7eb297a8e11b5e0d9339196f23918d6a4d0b85 /sub | |
parent | 7c565547b80fdc2a1bfdf31f9725129bcb16aa9d (diff) | |
parent | 1d0349d3b5d9a263251fcb3b0d7e135d4731bfd0 (diff) | |
download | mpv-199aabddcc0105b504cc8e0cb240bc3c89288c1a.tar.bz2 mpv-199aabddcc0105b504cc8e0cb240bc3c89288c1a.tar.xz |
Merge branch 'master' into pr6360
Manual changes done:
* Merged the interface-changes under the already master'd changes.
* Moved the hwdec-related option changes to video/decode/vd_lavc.c.
Diffstat (limited to 'sub')
-rw-r--r-- | sub/filter_sdh.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sub/filter_sdh.c b/sub/filter_sdh.c index ce8c28ed0a..a04f33a23e 100644 --- a/sub/filter_sdh.c +++ b/sub/filter_sdh.c @@ -406,8 +406,11 @@ char *filter_SDH(struct sd *sd, char *format, int n_ignored, char *data, int len line_with_text = true; } } else if (*rp && rp[0] != '\\') { - if (rp[0] > 32 && rp[0] < 127 && rp[0] != '-') + if ((rp[0] > 32 && rp[0] < 127 && rp[0] != '-') || + (unsigned char)rp[0] >= 0xC0) + { line_with_text = true; + } append(sd, buf, rp[0]); rp++; } else if (rp[0] == '\\' && rp[1] != 'N') { |