summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-08-28 17:07:55 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-08-28 17:07:55 +0000
commitac943f379a7b46967d8a1c4322f4f733b3771064 (patch)
tree2f8ab0b4aac59177fd0a260285e003abfaa4e365 /libmpdemux
parente70976de894fdab431675b1087292d6f3f253d2d (diff)
downloadmpv-ac943f379a7b46967d8a1c4322f4f733b3771064.tar.bz2
mpv-ac943f379a7b46967d8a1c4322f4f733b3771064.tar.xz
fixes problems when new line is just '\n' and not '\r\n' and enabled html-markup ignore. Patch by Piotr Krukowiecki <piotr@pingu.ii.uj.edu.pl>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7116 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_ogg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c
index d732cdf9c3..9248095803 100644
--- a/libmpdemux/demux_ogg.c
+++ b/libmpdemux/demux_ogg.c
@@ -164,7 +164,7 @@ void demux_ogg_add_sub (char* packet) {
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 @@ void demux_ogg_add_sub (char* packet) {
ignoring = 0;
break;
default:
- //if(!ignoring)
+ if(!ignoring)
ogg_sub.text[ogg_sub.lines][line_pos++] = c;
break;
}