Mercurial > mplayer.hg

diff mencoder.c @ 29690:b5e23411a51e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make -nosub work to disable subtitles even if -slang and dvd streams are used. This still needs some additional checking that subtitle selection via dvdnav works.
author reimar
date Tue, 29 Sep 2009 06:44:10 +0000
parents 94f1bca4f4b6
children 7ccde024713a
line wrap: on
line diff
--- a/mencoder.c	Mon Sep 28 11:33:40 2009 +0000
+++ b/mencoder.c	Tue Sep 29 06:44:10 2009 +0000
@@ -527,14 +527,14 @@
 #ifdef CONFIG_DVDREAD
 if(stream->type==STREAMTYPE_DVD){
   if(audio_lang && audio_id==-1) audio_id=dvd_aid_from_lang(stream,audio_lang);
-  if(dvdsub_lang && dvdsub_id==-2) dvdsub_id=dvd_sid_from_lang(stream,dvdsub_lang);
+  if(dvdsub_lang && dvdsub_id==-1) dvdsub_id=dvd_sid_from_lang(stream,dvdsub_lang);
 }
 #endif
 
 #ifdef CONFIG_DVDNAV
 if(stream->type==STREAMTYPE_DVDNAV){
   if(audio_lang && audio_id==-1) audio_id=mp_dvdnav_aid_from_lang(stream,audio_lang);
-  if(dvdsub_lang && dvdsub_id==-2) dvdsub_id=mp_dvdnav_sid_from_lang(stream,dvdsub_lang);
+  if(dvdsub_lang && dvdsub_id==-1) dvdsub_id=mp_dvdnav_sid_from_lang(stream,dvdsub_lang);
 }
 #endif