[MPlayer-dev-eng] [PATCH] always respect -sid also for dvds

[Reimar Döffinger]

Hello,
this patch ensures that -sid is always respected, esp. for dvds instead
of causing subtitles to be disabled if too large.
"Regressions":
the old code allowed (IMO unintended) to select between subtitles added
with -sub by using a large enough -sid (how large depends on e.g. how
many embedded subs the file played has).
Ok to apply?

Greetings,
Reimar Döffinger
-------------- next part --------------
Index: mplayer.c
===================================================================
--- mplayer.c	(revision 22217)
+++ mplayer.c	(working copy)
@@ -4377,6 +4284,7 @@
     if (demuxer->s_streams[i])
       global_sub_size++;
 }
+if (global_sub_size <= dvdsub_id) global_sub_size = dvdsub_id + 1;
 
 current_module="demux_open2";