summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-17 20:11:52 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-17 20:11:52 +0000
commitb9b610ed9a14be8692a1e522dd34a876cadcf9fc (patch)
tree9a59346f20d49e1e60fc2af277d772181701e3d1 /mplayer.c
parent637417346e2f384452d34e67fe2911e603d8a2ff (diff)
downloadmpv-b9b610ed9a14be8692a1e522dd34a876cadcf9fc.tar.bz2
mpv-b9b610ed9a14be8692a1e522dd34a876cadcf9fc.tar.xz
Support palette for general vobsub
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20994 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/mplayer.c b/mplayer.c
index 95c363da49..7e264875f9 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -4152,8 +4152,12 @@ if ((vo_spudec == NULL) && (demuxer->type == DEMUXER_TYPE_MATROSKA) &&
}
if (vo_spudec==NULL) {
+ sh_sub_t *sh = (sh_sub_t *)d_dvdsub->sh;
+ unsigned int *palette = NULL;
+ if (sh && sh->has_palette)
+ palette = sh->palette;
current_module="spudec_init_normal";
- vo_spudec=spudec_new_scaled(NULL, sh_video->disp_w, sh_video->disp_h);
+ vo_spudec=spudec_new_scaled(palette, sh_video->disp_w, sh_video->disp_h);
spudec_set_font_factor(vo_spudec,font_factor);
}