From ba57485970813104f7eace2467b9bd468a8f408c Mon Sep 17 00:00:00 2001 From: mosu Date: Thu, 16 Oct 2003 21:06:43 +0000 Subject: Support for VobSub-in-Matroska; parts outside of demux_mkv.cpp. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11154 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mplayer.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'mplayer.c') diff --git a/mplayer.c b/mplayer.c index 793317c34a..638c77e6ef 100644 --- a/mplayer.c +++ b/mplayer.c @@ -104,6 +104,9 @@ static int quiet=0; static int last_dvb_step = 1; #endif +#ifdef HAVE_MATROSKA +#include "libmpdemux/matroska.h" +#endif //**************************************************************************// // Playtree @@ -1602,6 +1605,16 @@ if (vo_spudec==NULL && stream->type==STREAMTYPE_DVD) { } #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 + if (vo_spudec==NULL) { current_module="spudec_init_normal"; vo_spudec=spudec_new_scaled(NULL, sh_video->disp_w, sh_video->disp_h); -- cgit v1.2.3