From a50a1eab17c2f73ff1806b217facd5b620be073e Mon Sep 17 00:00:00 2001 From: henry Date: Sun, 20 Jul 2003 15:29:40 +0000 Subject: ASS support git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10451 b3059339-0415-0410-9bf9-f77b7e298cf2 --- subreader.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'subreader.c') diff --git a/subreader.c b/subreader.c index 91dc561529..3e462d7a97 100644 --- a/subreader.c +++ b/subreader.c @@ -453,7 +453,13 @@ subtitle *sub_read_line_ssa(FILE *fd,subtitle *current) { "%[^\n\r]", ¬hing, &hour1, &min1, &sec1, &hunsec1, &hour2, &min2, &sec2, &hunsec2, - line3) < 9); + line3) < 9 + && + sscanf (line, "Dialogue: %d,%d:%d:%d.%d,%d:%d:%d.%d," + "%[^\n\r]", ¬hing, + &hour1, &min1, &sec1, &hunsec1, + &hour2, &min2, &sec2, &hunsec2, + line3) < 9 ); line2=strchr(line3, ','); @@ -904,6 +910,8 @@ int sub_autodetect (FILE *fd, int *uses_time) { if (!memcmp(line, "Dialogue: Marked", 16)) {*uses_time=1; return SUB_SSA;} + if (!memcmp(line, "Dialogue: ", 10)) + {*uses_time=1; return SUB_SSA;} if (sscanf (line, "%d,%d,\"%c", &i, &i, (char *) &i) == 3) {*uses_time=0;return SUB_DUNNOWHAT;} if (sscanf (line, "FORMAT=%d", &i) == 1) @@ -1605,7 +1613,7 @@ char** sub_filenames(char* path, char *fname) char *tmp_fname_noext, *tmp_fname_trim, *tmp_fname_ext, *tmpresult; int len, pos, found, i, j; - char * sub_exts[] = { "utf", "utf8", "utf-8", "sub", "srt", "smi", "rt", "txt", "ssa", "aqt", "jss", NULL}; + char * sub_exts[] = { "utf", "utf8", "utf-8", "sub", "srt", "smi", "rt", "txt", "ssa", "aqt", "jss", "ass", NULL}; subfn *result; char **result2; -- cgit v1.2.3