[Mplayer-cvslog] CVS: main subreader.c,1.112,1.113

[Jindrich Makovicka CVS]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv19660

Modified Files:
	subreader.c 
Log Message:
ASS support

Index: subreader.c
===================================================================
RCS file: /cvsroot/mplayer/main/subreader.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- subreader.c	1 Jul 2003 09:29:31 -0000	1.112
+++ subreader.c	20 Jul 2003 15:29:40 -0000	1.113
@@ -453,7 +453,13 @@
 			"%[^\n\r]", &nothing,
 			&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]", &nothing,
+			 &hour1, &min1, &sec1, &hunsec1, 
+			 &hour2, &min2, &sec2, &hunsec2,
+			 line3) < 9	    );
 
         line2=strchr(line3, ',');
 
@@ -904,6 +910,8 @@
 
 	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 *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;