diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-09 19:25:05 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-09 19:25:05 +0000 |
| commit | 2c443c4c0bd60cf49b8529905c6e6e3330cc864c (patch) | |
| tree | 27e9631ba0eb5f44f2f4e72cbcaeeb89a9643c1e /subreader.c | |
| parent | 38042349b00a354a4587ae453827f76c9098da2e (diff) | |
| download | mpv-2c443c4c0bd60cf49b8529905c6e6e3330cc864c.tar.bz2 mpv-2c443c4c0bd60cf49b8529905c6e6e3330cc864c.tar.xz | |
Since version 2.7 the file extension for JACOsub changed from
'.js' to '.jss', to avoid confusion with javascript.
There is also a new format for list_sub_file output; however
this is used only in debugging subtitles code, while disabled in
real life use.
patch by <salvatore.falco@katamail.com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8863 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'subreader.c')
| -rw-r--r-- | subreader.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/subreader.c b/subreader.c index 74b97acf1a..b6b241b341 100644 --- a/subreader.c +++ b/subreader.c @@ -574,7 +574,7 @@ subtitle *sub_read_line_aqt(FILE *fd,subtitle *current) { current->end = current->start; // will be corrected by next subtitle if (!fgets (line, LINE_LEN, fd)) - return current;; + return current; next = line,i=1; while ((next =sub_readtext (next, &(current->text[i])))) { @@ -1306,8 +1306,8 @@ char * sub_filename(char* path, char * fname ) ".SSA", ".aqt", ".AQT", - ".js", - ".JS" }; + ".jss", + ".JSS" }; if ( fname == NULL ) return NULL; @@ -1356,13 +1356,13 @@ void list_sub_file(subtitle* subs){ for(j=0;j<sub_num;j++){ subtitle* egysub=&subs[j]; - printf ("%i line%c (%li-%li) ", + printf ("%i line%c (%li-%li)\n", egysub->lines, (1==egysub->lines)?' ':'s', egysub->start, egysub->end); for (i=0; i<egysub->lines; i++) { - printf ("%s%s",egysub->text[i], i==egysub->lines-1?"":" <BREAK> "); + printf ("\t\t%d: %s%s", i,egysub->text[i], i==egysub->lines-1?"":" \n "); } printf ("\n"); } @@ -1510,7 +1510,7 @@ void dump_jacosub(subtitle* subs, float fps) { if (!sub_uses_time && sub_fps == 0) sub_fps = fps; - fd=fopen("dumpsub.js","w"); + fd=fopen("dumpsub.jss","w"); if(!fd) { perror("dump_jacosub: fopen"); |