# HG changeset patch
# User ulion
# Date 1194153826 0
# Node ID 919e3927809b9ca127ee4fefa0af5ce80531d1f9
# Parent  4fc6e60dac36248a6b62cae82fcac4ba2b5ac132
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.

diff -r 4fc6e60dac36 -r 919e3927809b mplayer.c
--- a/mplayer.c	Sat Nov 03 22:25:52 2007 +0000
+++ b/mplayer.c	Sun Nov 04 05:23:46 2007 +0000
@@ -3019,7 +3019,9 @@
       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";