From b86c9e59228c35c955d6758269755720cef78b50 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Sun, 16 Jan 2011 20:59:11 +0200 Subject: subs/demux: don't try to enable sub track when creating it demuxer.c new_sh_sub_sid() tried to immediately select the created sub track for playback if its id matched the "-sid" option value. This was buggy, as more initialization is needed to properly enable subtitles. Normally the correct track to play is selected after the demuxer has been created. It's possible that some DVD use case or such depended on the removed code to make -sid work with a subtitle track that's not found at start and only added later (vobsubs probably would start playing without separate initialization); if so then that needs to be fixed later in a different way. --- libmpdemux/demuxer.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index c45cb18729..eb548d4614 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -271,10 +271,6 @@ sh_sub_t *new_sh_sub_sid(demuxer_t *demuxer, int id, int sid) sh->opts = demuxer->opts; mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SUBTITLE_ID=%d\n", sid); } - if (sid == demuxer->opts->sub_id) { - demuxer->sub->id = id; - demuxer->sub->sh = demuxer->s_streams[id]; - } return demuxer->s_streams[id]; } -- cgit v1.2.3