From c85a382afac9598a43c6220fb1801feda5b2d617 Mon Sep 17 00:00:00 2001 From: eugeni Date: Fri, 29 Feb 2008 17:25:47 +0000 Subject: Don't select subtitle track in lavf and mkv demuxers. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26120 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_mkv.c | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'libmpdemux/demux_mkv.c') diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index 6081fb8adb..6363f7bc26 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -2475,27 +2475,6 @@ demux_mkv_open (demuxer_t *demuxer) demux_mkv_parse_vobsub_data (demuxer); - /* DO NOT automatically select a subtitle track and behave like DVD */ - /* playback: only show subtitles if the user explicitely wants them. */ - track = NULL; - if (demuxer->sub->id >= 0) - track = demux_mkv_find_track_by_num (mkv_d, demuxer->sub->id, - MATROSKA_TRACK_SUBTITLE); - else if (dvdsub_lang != NULL) - track = demux_mkv_find_track_by_language (mkv_d, dvdsub_lang, - MATROSKA_TRACK_SUBTITLE); - - if (track) - { - mp_msg (MSGT_DEMUX, MSGL_INFO, - MSGTR_MPDEMUX_MKV_WillDisplaySubtitleTrack, track->tnum); - dvdsub_id = demux_mkv_reverse_id(mkv_d, track->tnum, MATROSKA_TRACK_SUBTITLE); - demuxer->sub->id = track->tnum; - demuxer->sub->sh = demuxer->s_streams[track->tnum]; - } - else - demuxer->sub->id = -2; - if (demuxer->chapters) { for (i=0; i < (int)demuxer->num_chapters; i++) -- cgit v1.2.3