Mercurial > mplayer.hg

diff mencoder.c @ 29688:94f1bca4f4b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add a -nosub option that allows disabling auto-selected subtitles as e.g. the mkv demuxer supports.
author reimar
date Mon, 28 Sep 2009 11:32:27 +0000
parents 2e3751815a21
children b5e23411a51e
line wrap: on
line diff
--- a/mencoder.c	Mon Sep 28 11:31:25 2009 +0000
+++ b/mencoder.c	Mon Sep 28 11:32:27 2009 +0000
@@ -101,7 +101,7 @@
 
 int audio_id=-1;
 int video_id=-1;
-int dvdsub_id=-2;
+int dvdsub_id=-1;
 int vobsub_id=-1;
 char* audio_lang=NULL;
 char* dvdsub_lang=NULL;
@@ -554,10 +554,10 @@
 
   select_audio(demuxer, audio_id, audio_lang);
 
-  if (dvdsub_id < 0 && dvdsub_lang)
+  if (dvdsub_id == -1 && dvdsub_lang)
     dvdsub_id = demuxer_sub_track_by_lang(demuxer, dvdsub_lang);
 
-  if (dvdsub_id < 0)
+  if (dvdsub_id == -1)
     dvdsub_id = demuxer_default_sub_track(demuxer);
 
   for (i = 0; i < MAX_S_STREAMS; i++) {