Mercurial > mplayer.hg

comparison libmpdemux/demux_mkv.c @ 22157:b6f01e891ba8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make sure sub->sh is set when a subtitle is selected
author reimar
date Thu, 08 Feb 2007 14:19:18 +0000
parents 3d415b28e5e4
children fd54975f9135
comparison
equal deleted inserted replaced
22156:5b8b1e85db32 22157:b6f01e891ba8
2662 { 2662 {
2663 mp_msg (MSGT_DEMUX, MSGL_INFO, 2663 mp_msg (MSGT_DEMUX, MSGL_INFO,
2664 MSGTR_MPDEMUX_MKV_WillDisplaySubtitleTrack, track->tnum); 2664 MSGTR_MPDEMUX_MKV_WillDisplaySubtitleTrack, track->tnum);
2665 dvdsub_id = demux_mkv_reverse_id(mkv_d, track->tnum, MATROSKA_TRACK_SUBTITLE); 2665 dvdsub_id = demux_mkv_reverse_id(mkv_d, track->tnum, MATROSKA_TRACK_SUBTITLE);
2666 demuxer->sub->id = track->tnum; 2666 demuxer->sub->id = track->tnum;
2667 if (demuxer->sub->sh == NULL)
2668 demuxer->sub->sh = malloc(sizeof(sh_sub_t));
2669 if (demuxer->sub->sh != NULL)
2670 memcpy(demuxer->sub->sh, &track->sh_sub, sizeof(sh_sub_t));
2667 } 2671 }
2668 else 2672 else
2669 demuxer->sub->id = -2; 2673 demuxer->sub->id = -2;
2670 2674
2671 if (demuxer->chapters) 2675 if (demuxer->chapters)