0
0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00

changed subreader.c to read microdvd lines in form "{%ld}{}[^\r\n]" too

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4049 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
atlka 2002-01-08 11:03:43 +00:00
parent 9e128e3e82
commit 8da82b8b0e

View File

@ -171,12 +171,19 @@ subtitle *sub_read_line_microdvd(FILE *fd,subtitle *current) {
char *p, *next;
int i;
static subtitle *prevsub = NULL;
memset(current, 0, sizeof(subtitle));
do {
if (!fgets (line, LINE_LEN, fd)) return NULL;
} while (sscanf (line, "{%ld}{%ld}%[^\r\n]", &(current->start), &(current->end),line2) <3);
} while ((sscanf (line,
"{%ld}{}%[^\r\n]",
&(current->start), line2) < 2) &&
(sscanf (line,
"{%ld}{%ld}%[^\r\n]",
&(current->start), &(current->end), line2) < 3));
p=line2;
next=p, i=0;
@ -187,6 +194,14 @@ subtitle *sub_read_line_microdvd(FILE *fd,subtitle *current) {
}
current->lines= ++i;
if (!current->end)
current->end = current->start + 150; /* approx 6 sec */
if (prevsub && (prevsub->end >= current->start))
prevsub->end = current->start - 1; /* correct previous end time */
prevsub = current;
return current;
}