summaryrefslogtreecommitdiffstats
path: root/subreader.c
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-07-06 15:19:08 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-07-06 15:19:08 +0000
commit146376549dec310eb47dc9fdb282c54f0a36e82a (patch)
treecb24c433b9319e959e1ad7f13127fefb2dc10437 /subreader.c
parenta983a1f0883e3a24199ca31ea75181ae0bc3da9d (diff)
downloadmpv-146376549dec310eb47dc9fdb282c54f0a36e82a.tar.bz2
mpv-146376549dec310eb47dc9fdb282c54f0a36e82a.tar.xz
subrip sometimes uses pipe as newline separator - patch by MOLNAR Andor <dolphy@inf.elte.hu>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6658 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'subreader.c')
-rw-r--r--subreader.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/subreader.c b/subreader.c
index 66767d9282..5fe0545dff 100644
--- a/subreader.c
+++ b/subreader.c
@@ -212,13 +212,14 @@ subtitle *sub_read_line_subrip(FILE *fd, subtitle *current) {
p=q=line;
for (current->lines=1; current->lines < SUB_MAX_TEXT; current->lines++) {
- for (q=p,len=0; *p && *p!='\r' && *p!='\n' && strncmp(p,"[br]",4); p++,len++);
+ for (q=p,len=0; *p && *p!='\r' && *p!='\n' && *p!='|' && strncmp(p,"[br]",4); p++,len++);
current->text[current->lines-1]=(char *)malloc (len+1);
if (!current->text[current->lines-1]) return ERR;
strncpy (current->text[current->lines-1], q, len);
current->text[current->lines-1][len]='\0';
if (!*p || *p=='\r' || *p=='\n') break;
- while (*p++!=']');
+ if (*p=='|') p++;
+ else while (*p++!=']');
}
break;
}