summaryrefslogtreecommitdiffstats
path: root/subreader.c
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-05-30 17:44:58 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-05-30 17:44:58 +0000
commitc04588fedf6769fef13af28c6efce4dbd4a16cf2 (patch)
tree32df572bce8172d919bc2051ebf085028cad47a9 /subreader.c
parent3ed40f831499bb5a3e7e6dd281f7757ab61e2589 (diff)
downloadmpv-c04588fedf6769fef13af28c6efce4dbd4a16cf2.tar.bz2
mpv-c04588fedf6769fef13af28c6efce4dbd4a16cf2.tar.xz
possible sig11 fixed in .rt parser (weisskreuzova.zip)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6243 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'subreader.c')
-rw-r--r--subreader.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/subreader.c b/subreader.c
index d3e75a9263..df5d00bcc0 100644
--- a/subreader.c
+++ b/subreader.c
@@ -149,6 +149,8 @@ char *sub_readtext(char *source, char **dest) {
int len=0;
char *p=source;
+// printf("src=%p dest=%p \n",source,dest);
+
while ( !eol(*p) && *p!= '|' ) {
p++,len++;
}
@@ -358,11 +360,14 @@ subtitle *sub_read_line_rt(FILE *fd,subtitle *current) {
current->end = b1*360000+b2*6000+b3*100+b4/10;
p=line; p+=plen;i=0;
// TODO: I don't know what kind of convention is here for marking multiline subs, maybe <br/> like in xml?
- next = strstr(line,"<clear/>")+8;i=0;
- while ((next =sub_readtext (next, &(current->text[i])))) {
+ next = strstr(line,"<clear/>");
+ if(next && strlen(next)>8){
+ next+=8;i=0;
+ while ((next =sub_readtext (next, &(current->text[i])))) {
if (current->text[i]==ERR) {return ERR;}
i++;
if (i>=SUB_MAX_TEXT) { printf ("Too many lines in a subtitle\n");current->lines=i;return current;}
+ }
}
current->lines=i+1;
}