Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv3055 Modified Files: mplayer.c Log Message: Support for VobSub-in-Matroska; parts outside of demux_mkv.cpp. Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.731 retrieving revision 1.732 diff -u -r1.731 -r1.732 --- mplayer.c 4 Oct 2003 01:24:50 -0000 1.731 +++ mplayer.c 16 Oct 2003 21:06:18 -0000 1.732 @@ -104,6 +104,9 @@ static int last_dvb_step = 1; #endif +#ifdef HAVE_MATROSKA +#include "libmpdemux/matroska.h" +#endif //**************************************************************************// // Playtree @@ -1599,6 +1602,16 @@ current_module="spudec_init_dvdread"; vo_spudec=spudec_new_scaled(((dvd_priv_t *)(stream->priv))->cur_pgc->palette, sh_video->disp_w, sh_video->disp_h); +} +#endif + +#ifdef HAVE_MATROSKA +if ((vo_spudec == NULL) && (demuxer->type == DEMUXER_TYPE_MATROSKA) && + (d_dvdsub->sh != NULL) && (((mkv_sh_sub_t *)d_dvdsub->sh)->type == 'v')) { + current_module = "spudec_init_matroska"; + vo_spudec = spudec_new_scaled(((mkv_sh_sub_t *)d_dvdsub->sh)->palette, + ((mkv_sh_sub_t *)d_dvdsub->sh)->width, + ((mkv_sh_sub_t *)d_dvdsub->sh)->height); } #endif