Mercurial > mplayer.hg

changeset 17379:9d99333ce6ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author nicodvb
date Fri, 13 Jan 2006 20:06:59 +0000
parents 4dd3605dc63a
children 86e9a4a10456
files mplayer.c
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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.