summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-05-21 18:45:30 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-05-21 18:45:30 +0000
commitae94f470b2fced72661c03eb93ec5ed831cb72d6 (patch)
treec0f153977b85ebc67aeb655c85f2bddc8d539fc0 /libmpdemux
parent2bdedd33ed2636bff2fb8cfae9c43cae3cd9b5f8 (diff)
downloadmpv-ae94f470b2fced72661c03eb93ec5ed831cb72d6.tar.bz2
mpv-ae94f470b2fced72661c03eb93ec5ed831cb72d6.tar.xz
Make internal subtitle and subtitle switching work with -audiofile
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26849 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_demuxers.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libmpdemux/demux_demuxers.c b/libmpdemux/demux_demuxers.c
index 615e1961ee..a5f87e601b 100644
--- a/libmpdemux/demux_demuxers.c
+++ b/libmpdemux/demux_demuxers.c
@@ -38,6 +38,11 @@ demuxer_t* new_demuxers_demuxer(demuxer_t* vd, demuxer_t* ad, demuxer_t* sd) {
ret->audio = ad->audio;
ret->sub = sd->sub;
+ // HACK?, necessary for subtitle (and audio and video when implemented) switching
+ memcpy(ret->v_streams, vd->v_streams, sizeof(ret->v_streams));
+ memcpy(ret->a_streams, ad->a_streams, sizeof(ret->a_streams));
+ memcpy(ret->s_streams, sd->s_streams, sizeof(ret->s_streams));
+
ret->desc = &demuxer_desc_demuxers;
return ret;