RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-19 09:57:34 +00:00
Code Issues Releases Wiki Activity

Don't select subtitle track in lavf and mkv demuxers.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26120 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
eugeni 2008-02-29 17:25:47 +00:00
parent 96b0752265
commit c85a382afa
3 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libmpdemux/demux_lavf.c
View File

@ -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;
}

21
libmpdemux/demux_mkv.c
View File

@ -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++)

4
libmpdemux/demuxer.c
View File

@ -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];
}