summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-01-13 20:06:59 +0000
committernicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-01-13 20:06:59 +0000
commitcb832df90c4ebfb60a82886827bd74d1035dbdf8 (patch)
tree7cb35caa275a7dadfaa092e8b76e110011e315a5
parent0f32eccff78bf0c847201a57d35cbf9e50755dfb (diff)
downloadmpv-cb832df90c4ebfb60a82886827bd74d1035dbdf8.tar.bz2
mpv-cb832df90c4ebfb60a82886827bd74d1035dbdf8.tar.xz
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
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17380 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--mplayer.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mplayer.c b/mplayer.c
index 4cb368e0d2..4d123cd49c 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -266,7 +266,7 @@ extern char *sub_demuxer_name; // override sub demuxer
// 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_dump_type==5){
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.