aboutsummaryrefslogtreecommitdiffhomepage
path: root/libmpdemux
diff options
context:
space:
mode:
authorGravatar eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-01-11 21:45:20 +0000
committerGravatar eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-01-11 21:45:20 +0000
commit0d36212f39d5be3963ffd22a950612e368e1cf54 (patch)
tree1f4b529b15c78484d831275592aaa1ddc2a2742c /libmpdemux
parentbdb6a07d2a712c752cc7f04dd0afd5950e4607f7 (diff)
Remove global_ass_track. Instead create an ass_track for each 't' track.
Global_ass_track obviously can not work when there is more than one 't tracks, their lines will be mixed up. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25684 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demuxer.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 512178915d..2bf76199fc 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -827,7 +827,8 @@ int biComp=le2me_32(sh_video->bih->biCompression);
sh->ass_track = ass_new_track(ass_library);
if (sh->ass_track && sh->extradata)
ass_process_codec_private(sh->ass_track, sh->extradata, sh->extradata_len);
- }
+ } else if (sh && sh->type == 't')
+ sh->ass_track = ass_default_track(ass_library);
}
}
#endif