diff mencoder.c @ 26087:2a112aed0dda

Demuxer-independent subtitle track selection.
author eugeni
date Fri, 29 Feb 2008 17:25:44 +0000
parents 2cb4aabb7dd8
children c585e2ad8ebf
line wrap: on
line diff
--- a/mencoder.c	Fri Feb 29 17:25:43 2008 +0000
+++ b/mencoder.c	Fri Feb 29 17:25:44 2008 +0000
@@ -600,6 +600,18 @@
 	mencoder_exit(1,NULL);
   }
  
+  if (dvdsub_id < 0 && dvdsub_lang)
+    dvdsub_id = demuxer_sub_track_by_lang(demuxer, dvdsub_lang);
+
+  for (i = 0; i < MAX_S_STREAMS; i++) {
+    sh_sub_t *sh = demuxer->s_streams[i];
+    if (sh && sh->sid == dvdsub_id) {
+      demuxer->sub->id = i;
+      demuxer->sub->sh = sh;
+      break;
+    }
+  }
+
   if(dvd_chapter>1) {
     float pts;
     if (demuxer_seek_chapter(demuxer, dvd_chapter-1, 1, &pts, NULL, NULL) >= 0 && pts > -1.0)