RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

osd_libass: fix \n escapes 

Apparently libass can't be made to not interpret "\n" as escape. That
means "\n" can't be printed literally. Use the same hack that was added
to mplayer2 when that project merged osd_libass.c: add an invisible
zero-width joiner character between "\" and "n". It seems U+FEFF is
deprecated, because it has been redefined as BOM mark. Use U+2060, which
seems to be the replacement.
This commit is contained in:
wm4 2012-10-13 21:09:34 +02:00
parent 7d3efa8940
commit 0ff7dd992f
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sub/osd_libass.c
View File

@ -233,14 +233,6 @@ static char *mangle_ass(const char *in)
{ {
char *res = talloc_strdup(NULL, ""); char *res = talloc_strdup(NULL, "");
while (*in) { while (*in) {
if (in[0] == '\\' && strchr("nNh{}", in[1])) {
// Undo escaping, e.g. \{ -> \\{
// Note that e.g. \\j still must be emitted as \\j
// (libass only understands the escapes listed in the strchr args)
res = talloc_asprintf_append_buffer(res, "\\\\%c", in[1]);
in += 2;
continue;
}
// As used by osd_get_function_sym(). // As used by osd_get_function_sym().
if (in[0] == '\xFF') { if (in[0] == '\xFF') {
res = talloc_strdup_append_buffer(res, ASS_USE_OSD_FONT); res = talloc_strdup_append_buffer(res, ASS_USE_OSD_FONT);
@ -252,6 +244,9 @@ static char *mangle_ass(const char *in)
if (*in == '{') if (*in == '{')
res = talloc_strdup_append_buffer(res, "\\"); res = talloc_strdup_append_buffer(res, "\\");
res = talloc_strndup_append_buffer(res, in, 1); res = talloc_strndup_append_buffer(res, in, 1);
// Break ASS escapes with U+2060 WORD JOINER
if (*in == '\\')
append_utf8_buffer(res, 0x2060);
in++; in++;
} }
return res; return res;