diff options
| -rw-r--r-- | libmpdemux/demux_lavf.c | 7 | ||||
| -rw-r--r-- | libmpdemux/demux_mkv.c | 21 | ||||
| -rw-r--r-- | libmpdemux/demuxer.c | 4 |
3 files changed, 0 insertions, 32 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 5ab20a06e8..01d505ca9b 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -433,13 +433,6 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) { } if (st->language) sh_sub->lang = strdup(st->language); - if (demuxer->sub->id == -1 - || (demuxer->sub->id == -2 && (dvdsub_lang && st->language[0] && !strncmp(dvdsub_lang, st->language, 3))) - || demuxer->sub->id == priv->sub_streams) { - dvdsub_id = priv->sub_streams; - demuxer->sub->id = priv->sub_streams; - demuxer->sub->sh = sh_sub; - } priv->sub_streams++; break; } 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++) diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index e842164d3a..20a1fc44ed 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -241,10 +241,6 @@ sh_sub_t *new_sh_sub_sid(demuxer_t *demuxer, int id, int sid) { demuxer->s_streams[id] = sh; sh->sid = sid; mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SUBTITLE_ID=%d\n", sid); - if (dvdsub_id == id) { - demuxer->sub->id = id; - demuxer->sub->sh = sh; - } } return demuxer->s_streams[id]; } |