[Mplayer-cvslog] CVS: main/libmpdemux demux_ogg.c,1.11,1.12

[Alex Beregszaszi]

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

Modified Files:
	demux_ogg.c 
Log Message:
fixes problems when new line is just '\n' and not '\r\n' and enabled html-markup ignore. Patch by Piotr Krukowiecki <piotr at pingu.ii.uj.edu.pl>

Index: demux_ogg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ogg.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- demux_ogg.c	14 Aug 2002 23:41:19 -0000	1.11
+++ demux_ogg.c	28 Aug 2002 17:07:55 -0000	1.12
@@ -164,7 +164,7 @@
     lcv = 3;
     while (1) {
       int c = packet[lcv++];
-      if(c=='\r' || c==0 || line_pos >= OGG_SUB_MAX_LINE-1){
+      if(c=='\n' || c==0 || line_pos >= OGG_SUB_MAX_LINE-1){
 	  ogg_sub.text[ogg_sub.lines][line_pos] = 0; // close sub
           if(line_pos) ogg_sub.lines++;
 	  if(!c || ogg_sub.lines>=SUB_MAX_TEXT) break; // EOL or TooMany
@@ -182,7 +182,7 @@
           ignoring = 0;
           break;
         default:
-          //if(!ignoring) 
+          if(!ignoring) 
 	  ogg_sub.text[ogg_sub.lines][line_pos++] = c;
           break;
       }