summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-02-08 14:19:18 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-02-08 14:19:18 +0000
commita63f68fb4cbd1031ffdfdd6b6639ad63460f1dae (patch)
treeb6a436c0efefa613c91a6eedc90fbd5101dae194 /libmpdemux
parent0d48d2f02c009152aa7f237a81ebdf7e5d576c97 (diff)
downloadmpv-a63f68fb4cbd1031ffdfdd6b6639ad63460f1dae.tar.bz2
mpv-a63f68fb4cbd1031ffdfdd6b6639ad63460f1dae.tar.xz
Make sure sub->sh is set when a subtitle is selected
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22175 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_mkv.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index a9d52c34b1..e075082ecf 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -2664,6 +2664,10 @@ demux_mkv_open (demuxer_t *demuxer)
MSGTR_MPDEMUX_MKV_WillDisplaySubtitleTrack, track->tnum);
dvdsub_id = demux_mkv_reverse_id(mkv_d, track->tnum, MATROSKA_TRACK_SUBTITLE);
demuxer->sub->id = track->tnum;
+ if (demuxer->sub->sh == NULL)
+ demuxer->sub->sh = malloc(sizeof(sh_sub_t));
+ if (demuxer->sub->sh != NULL)
+ memcpy(demuxer->sub->sh, &track->sh_sub, sizeof(sh_sub_t));
}
else
demuxer->sub->id = -2;