RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge (trivial) dvdnav and dvdread subtitle selection code 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23569 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2007-06-17 08:29:26 +00:00
parent b6e735fde1
commit eb6179a168
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
command.c
View File

@ -1243,17 +1243,6 @@ static int mp_property_sub(m_option_t * prop, int action, void *arg,
dvdsub_id = dvdsub_id =
mpctx->global_sub_pos - mpctx->global_sub_indices[SUB_SOURCE_DEMUX]; mpctx->global_sub_pos - mpctx->global_sub_indices[SUB_SOURCE_DEMUX];
if (d_sub) { if (d_sub) {
#ifdef USE_DVDREAD
if (vo_spudec && mpctx->stream->type == STREAMTYPE_DVD) {
d_sub->id = dvdsub_id;
}
#endif
#ifdef USE_DVDNAV
if (vo_spudec && mpctx->stream->type == STREAMTYPE_DVDNAV) {
d_sub->id = dvdsub_id;
}
#endif
if (mpctx->stream->type != STREAMTYPE_DVD if (mpctx->stream->type != STREAMTYPE_DVD
&& mpctx->stream->type != STREAMTYPE_DVDNAV) { && mpctx->stream->type != STREAMTYPE_DVDNAV) {
int i = 0; int i = 0;
@ -1268,6 +1257,8 @@ static int mp_property_sub(m_option_t * prop, int action, void *arg,
} }
} }
} }
else if (vo_spudec)
d_sub->id = dvdsub_id;
if (mpctx->demuxer->type == DEMUXER_TYPE_MATROSKA) if (mpctx->demuxer->type == DEMUXER_TYPE_MATROSKA)
d_sub->id = demux_mkv_change_subs(mpctx->demuxer, dvdsub_id); d_sub->id = demux_mkv_change_subs(mpctx->demuxer, dvdsub_id);
if (d_sub->sh && d_sub->id >= 0) { if (d_sub->sh && d_sub->id >= 0) {