RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-27 02:40:53 +00:00
Code Issues Releases Wiki Activity

sd_ass: strip empty/whitespace lines in -no-ass mode

Browse Source 
Will just destroy output. In some cases empty newlines might be used by
bad scripts for spacing; too bad for them.
This commit is contained in:
wm4 2013-06-02 19:11:25 +02:00
parent 6dbedd27d5
commit e42a771413
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sub/sd_ass.c
View File

@ -224,6 +224,16 @@ static void ass_to_plaintext(struct buf *b, const char *in)
}
}
// Empty string counts as whitespace. Reads s[len-1] even if there are \0s.
static bool is_whitespace_only(char *s, int len)
{
for (int n = 0; n < len; n++) {
if (s[n] != ' ' && s[n] != '\t')
return false;
}
return true;
}
static char *get_text(struct sd *sd, double pts)
{
struct sd_ass_priv *ctx = sd->priv;
@ -240,8 +250,10 @@ static char *get_text(struct sd *sd, double pts)
double end = (event->Start + event->Duration) / 1000.0;
if (pts >= start && pts < end) {
if (event->Text) {
int start = b.len;
ass_to_plaintext(&b, event->Text);
append(&b, '\n');
if (!is_whitespace_only(&b.start[b.len], b.len - start))
append(&b, '\n');
}
}
}