From ecd1cd4168aeeccfaedf9395825d99ea164c9361 Mon Sep 17 00:00:00 2001 From: ulion Date: Sun, 4 Nov 2007 05:23:46 +0000 Subject: Old code for dvdsub_id fix assume the global_sub_indices[SUB_SOURCE_DEMUX] must be zero when use a dvdsub_id greater than max sub id from demux. To remove the implicit assumption, make it up here. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24962 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mplayer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'mplayer.c') diff --git a/mplayer.c b/mplayer.c index 9b80c4f33d..0c741c8d07 100644 --- a/mplayer.c +++ b/mplayer.c @@ -3019,7 +3019,9 @@ if (mpctx->stream->type != STREAMTYPE_DVD && mpctx->stream->type != STREAMTYPE_D maxid = FFMAX(maxid, ((sh_sub_t *)mpctx->demuxer->s_streams[i])->sid); mpctx->global_sub_size += maxid + 1; } -if (mpctx->global_sub_size <= dvdsub_id) mpctx->global_sub_size = dvdsub_id + 1; +// Make dvdsub_id always selectable if set. +if (mpctx->global_sub_size <= mpctx->global_sub_indices[SUB_SOURCE_DEMUX] + dvdsub_id) + mpctx->global_sub_size = mpctx->global_sub_indices[SUB_SOURCE_DEMUX] + dvdsub_id + 1; current_module="demux_open2"; -- cgit v1.2.3