From cfa148bdb8d3f4dc3924cfd14cc8b486322d9c8e Mon Sep 17 00:00:00 2001 From: arpi Date: Wed, 27 Mar 2002 01:22:11 +0000 Subject: [PATCH] vplayer sub fix by Arkadiusz Podgorski git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5364 b3059339-0415-0410-9bf9-f77b7e298cf2 --- subreader.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/subreader.c b/subreader.c index cb1cf4585b..082218a20f 100644 --- a/subreader.c +++ b/subreader.c @@ -265,6 +265,7 @@ subtitle *sub_read_line_vplayer(FILE *fd,subtitle *current) { if (!(current->start = a1*360000+a2*6000+a3*100)) continue; + /* removed by wodzu p=line; // finds the body of the subtitle for (i=0; i<3; i++){ @@ -276,6 +277,11 @@ subtitle *sub_read_line_vplayer(FILE *fd,subtitle *current) { printf("SUB: Skipping incorrect subtitle line!\n"); continue; } + */ + // by wodzu: hey! this time we know what length it has! what is + // that magic for? it can't deal with space instead of third + // colon! look, what simple it can be: + p = &line[ plen ]; i=0; if (*p!='|') { @@ -489,6 +495,8 @@ int sub_autodetect (FILE *fd) { {sub_uses_time=1; return SUB_SAMI;} if (sscanf (line, "%d:%d:%d:", &i, &i, &i )==3) {sub_uses_time=1;return SUB_VPLAYER;} + if (sscanf (line, "%d:%d:%d ", &i, &i, &i )==3) + {sub_uses_time=1;return SUB_VPLAYER;} //TODO: just checking if first line of sub starts with "<" is WAY // too weak test for RT // Please someone who knows the format of RT... FIX IT!!!