Mercurial > mplayer.hg

diff mplayer.c @ 12550:733c9d9882d1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support for the "custom colors" and "forced subtitles" entries in the VobSub idx. Made the parser handle whitespaces better.
author mosu
date Thu, 10 Jun 2004 11:16:44 +0000
parents 85f18227756f
children 9709ce101949
line wrap: on
line diff
--- a/mplayer.c	Thu Jun 10 05:20:50 2004 +0000
+++ b/mplayer.c	Thu Jun 10 11:16:44 2004 +0000
@@ -1603,10 +1603,13 @@
 #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')) {
+  mkv_sh_sub_t *mkv_sh_sub = (mkv_sh_sub_t *)d_dvdsub->sh;
   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);
+  vo_spudec =
+    spudec_new_scaled_vobsub(mkv_sh_sub->palette, mkv_sh_sub->colors,
+                             mkv_sh_sub->custom_colors, mkv_sh_sub->width,
+                             mkv_sh_sub->height);
+  forced_subs_only = mkv_sh_sub->forced_subs_only;
 }
 #endif