summaryrefslogtreecommitdiffstats
path: root/mencoder.c
diff options
context:
space:
mode:
authoreugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-02-29 17:25:44 +0000
committereugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-02-29 17:25:44 +0000
commit96b0752265b8c5094036d64b815cd21c6084b863 (patch)
treee8b7c3f3076569500271c6c234a8f85d57693a3f /mencoder.c
parent2c8e65329f3cabd86428d26dd0ed2fec49f38b41 (diff)
downloadmpv-96b0752265b8c5094036d64b815cd21c6084b863.tar.bz2
mpv-96b0752265b8c5094036d64b815cd21c6084b863.tar.xz
Demuxer-independent subtitle track selection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26119 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
-rw-r--r--mencoder.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/mencoder.c b/mencoder.c
index 4f93cd8d2a..5feb694936 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -600,6 +600,18 @@ if(stream->type==STREAMTYPE_DVDNAV){
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)