summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mov.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-19 11:55:03 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-19 11:55:03 +0000
commit5b391eb2a360e0a8c0de22e35929f08c5e6efddb (patch)
tree79575ed5fbd3ccefa301732c393f68acf302fdc1 /libmpdemux/demux_mov.c
parent8979378150a2ec798fb5838a7dcc85af0a238e0f (diff)
downloadmpv-5b391eb2a360e0a8c0de22e35929f08c5e6efddb.tar.bz2
mpv-5b391eb2a360e0a8c0de22e35929f08c5e6efddb.tar.xz
Support multiple subs in mov
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21048 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_mov.c')
-rw-r--r--libmpdemux/demux_mov.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c
index f959350080..6eb2a8ab6e 100644
--- a/libmpdemux/demux_mov.c
+++ b/libmpdemux/demux_mov.c
@@ -2175,6 +2175,8 @@ if(trak->pos==0 && trak->stream_header_len>0){
if (sh->type == 'v')
ds_read_packet(demuxer->sub, demuxer->stream, len, subpts, pos, 0);
else {
+ int i;
+ char *line = priv->subtext;
stream_skip(demuxer->stream, 2); // size
len -= 2;
if (len < 0) len = 0;
@@ -2183,6 +2185,11 @@ if(trak->pos==0 && trak->stream_header_len>0){
priv->subtext[len] = 0;
priv->subs.lines = 1;
priv->subs.text[0] = &priv->subtext;
+ while ((line = strchr(line, '\n'))) {
+ *line++ = 0;
+ priv->subs.text[priv->subs.lines] = line;
+ priv->subs.lines++;
+ }
vo_sub = &priv->subs;
}
priv->current_sub = samplenr;