summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-03-29 11:21:18 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-03-29 11:21:18 +0000
commit20a4844e8058bc08d532af29d7f3623c7735140f (patch)
treeff7b8acf011cae907cdd620e1187bf6cf106d444 /libmpdemux/demuxer.c
parentbdbf4f617d38fe44ecc402e87b94edf02dd66e0f (diff)
downloadmpv-20a4844e8058bc08d532af29d7f3623c7735140f.tar.bz2
mpv-20a4844e8058bc08d532af29d7f3623c7735140f.tar.xz
Update demuxer->sub->id and demuxer->sub->sh if a new subtitle stream is
created that matches the user-requested one. Fixes -slang and -sid with DVDs (anything that uses demux_mpg actually). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29095 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.c')
-rw-r--r--libmpdemux/demuxer.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index bfe321b37d..e360572d7f 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -259,6 +259,10 @@ sh_sub_t *new_sh_sub_sid(demuxer_t *demuxer, int id, int sid)
sh->sid = sid;
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SUBTITLE_ID=%d\n", sid);
}
+ if (sid == dvdsub_id) {
+ demuxer->sub->id = id;
+ demuxer->sub->sh = demuxer->s_streams[id];
+ }
return demuxer->s_streams[id];
}