# HG changeset patch # User reimar # Date 1170944358 0 # Node ID b6f01e891ba8c29015217dd59256b0f6b4345e4d # Parent 5b8b1e85db32e65699baaae511db20e1275b215b Make sure sub->sh is set when a subtitle is selected diff -r 5b8b1e85db32 -r b6f01e891ba8 libmpdemux/demux_mkv.c --- a/libmpdemux/demux_mkv.c Thu Feb 08 11:27:18 2007 +0000 +++ b/libmpdemux/demux_mkv.c Thu Feb 08 14:19:18 2007 +0000 @@ -2664,6 +2664,10 @@ 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;