--- src/subgen.c.old 2004-09-04 19:12:19.609738456 +0200 +++ src/subgen.c.old 2004-09-04 19:15:16.979774112 +0200 @@ -393,24 +393,23 @@ if( !newsti ) { fprintf(stderr, "INFO: Found EOF in .sub file.\n"); + fprintf(stderr, "spts: %d sd: %d\n",\ + cursti->spts / 90000, cursti->sd / 90000); } - - if(newsti) /* not last sub */ + else /* not last sub */ { if(cursti->spts + cursti->sd + tbs > newsti->spts) { - if (debug > 4) - fprintf(stderr, "WARN: Overlapping sub\n"); cursti->sd = -1; + if (debug > 4) + { + fprintf(stderr, "WARN: Overlapping sub\n"); + fprintf(stderr, "spts: %d sd: %d nspts: %d\n",\ + cursti->spts / 90000, cursti->sd / 90000, newsti->spts / 90000); + } } } /* end if ! last sub */ - if(debug > 4) - { - fprintf(stderr, "spts: %d sd: %d nspts: %d\n",\ - cursti->spts / 90000, cursti->sd / 90000, newsti->spts / 90000); - } - if( (cursti->sd == -1) && newsti && ( (!svcd) || until_next_sub) ) { if(newsti->spts > cursti->spts + tbs) cursti->sd = newsti->spts - cursti->spts - tbs;