Commit d39d9c68 authored by Tim-Philipp Müller's avatar Tim-Philipp Müller
Browse files

gst/subparse/gstsubparse.c: Strip trailing newlines from subtitle text output.

Original commit message from CVS:
* gst/subparse/gstsubparse.c: (strip_trailing_newlines),
(parse_subrip):
Strip trailing newlines from subtitle text output.
parent b9063640
2006-10-19 Tim-Philipp Müller <tim at centricular dot net>
* gst/subparse/gstsubparse.c: (strip_trailing_newlines),
(parse_subrip):
Strip trailing newlines from subtitle text output.
2006-10-18 Tim-Philipp Müller <tim at centricular dot net>
 
* gst/subparse/gstsubparse.c: (gst_sub_parse_dispose),
......@@ -476,6 +476,20 @@ parse_mdvdsub (ParserState * state, const gchar * line)
return ret;
}
static void
strip_trailing_newlines (gchar * txt)
{
if (txt) {
guint len;
len = strlen (txt);
while (len > 1 && txt[len - 1] == '\n') {
txt[len - 1] = '\0';
--len;
}
}
}
/* we want to escape text in general, but retain basic markup like
* <i></i>, <u></u>, and <b></b>. The easiest and safest way is to
* just unescape a white list of allowed markups again after
......@@ -572,6 +586,7 @@ parse_subrip (ParserState * state, const gchar * line)
g_string_truncate (state->buf, 0);
state->state = 0;
subrip_unescape_formatting (ret);
strip_trailing_newlines (ret);
return ret;
}
return NULL;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment