# HG changeset patch
# User nicodvb
# Date 1137182819 0
# Node ID 9d99333ce6ab82d79b379e17cbcd9c8c7c11f151
# Parent  4dd3605dc63aee50f21d8a85fe3195a171ab234d
dvd subtitles should be disabled by default, and enabled specifying -sid or -slang; this fix also restores the display of other subtitles types when dvd subs are present

diff -r 4dd3605dc63a -r 9d99333ce6ab mplayer.c
--- a/mplayer.c	Fri Jan 13 20:02:37 2006 +0000
+++ b/mplayer.c	Fri Jan 13 20:06:59 2006 +0000
@@ -266,7 +266,7 @@
 // streaming:
 int audio_id=-1;
 int video_id=-1;
-int dvdsub_id=-1;
+int dvdsub_id=-2;
 int vobsub_id=-1;
 char* audio_lang=NULL;
 char* dvdsub_lang=NULL;
@@ -1945,6 +1945,7 @@
 if(stream->type==STREAMTYPE_DVD){
   current_module="dvd lang->id";
   if(audio_id==-1) audio_id=dvd_aid_from_lang(stream,audio_lang);
+  if(dvdsub_lang && dvdsub_id==-2) dvdsub_id=-1;
   if(dvdsub_lang && dvdsub_id==-1) dvdsub_id=dvd_sid_from_lang(stream,dvdsub_lang);
   // setup global sub numbering
   global_sub_indices[SUB_SOURCE_DEMUX] = global_sub_size; // the global # of the first demux-specific sub.