[MPlayer-cvslog] r22175 - trunk/libmpdemux/demux_mkv.c

[reimar]

Author: reimar
Date: Thu Feb  8 15:19:18 2007
New Revision: 22175

Modified:
   trunk/libmpdemux/demux_mkv.c

Log:
Make sure sub->sh is set when a subtitle is selected


Modified: trunk/libmpdemux/demux_mkv.c
==============================================================================
--- trunk/libmpdemux/demux_mkv.c	(original)
+++ trunk/libmpdemux/demux_mkv.c	Thu Feb  8 15:19:18 2007
@@ -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;