From c7976c4d0d8d02fa18bc9fd82bafe99e333e2a53 Mon Sep 17 00:00:00 2001 From: Miguel Freitas Date: Sat, 29 Oct 2005 20:51:01 +0000 Subject: fix some nonsense i did :) CVS patchset: 7776 CVS date: 2005/10/29 20:51:01 --- src/libsputext/demux_sputext.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/libsputext/demux_sputext.c b/src/libsputext/demux_sputext.c index dfdc6e4ef..91db10586 100644 --- a/src/libsputext/demux_sputext.c +++ b/src/libsputext/demux_sputext.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_sputext.c,v 1.45 2005/10/29 20:18:57 miguelfreitas Exp $ + * $Id: demux_sputext.c,v 1.46 2005/10/29 20:51:01 miguelfreitas Exp $ * * code based on old libsputext/xine_decoder.c * @@ -358,12 +358,7 @@ static subtitle_t *sub_read_line_subrip(demux_sputext_t *this,subtitle_t *curren do { if(!read_line_from_input(this,line,LINE_LEN)) return NULL; - i = sscanf(line,"%d:%d:%d,%d --> %d:%d:%d,%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4); - if( i < 8 ) { - i = sscanf(line,"%d:%d:%d.%d --> %d:%d:%d.%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4); - a4 /= 10; - b4 /= 10; - } + i = sscanf(line,"%d:%d:%d%*[,.]%d --> %d:%d:%d%*[,.]%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4); } while(i < 8); current->start = a1*360000+a2*6000+a3*100+a4/10; current->end = b1*360000+b2*6000+b3*100+b4/10; -- cgit v1.2.3