Mercurial > mplayer.hg

changeset 10450:2d3f6a2996da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ASS support
author henry
date Sun, 20 Jul 2003 15:29:40 +0000
parents 498568fe7fd8
children e97b59049b4c
files subreader.c
diffstat 1 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/subreader.c	Sun Jul 20 15:01:00 2003 +0000
+++ b/subreader.c	Sun Jul 20 15:29:40 2003 +0000
@@ -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;