[MPlayer-cvslog] CVS: main mplayer.c,1.828,1.829

[Moritz Bunkus CVS]

CVS change done by Moritz Bunkus CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv12716

Modified Files:
	mplayer.c 
Log Message:
Handle missing palettes in the info part of VobSubs in Matroska files correctly by giving mplayer a NULL pointer. This way it will use a default palette instead of black only. Patch by Csillag Kristof (fenwick () freemail ! hu)

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.828
retrieving revision 1.829
diff -u -r1.828 -r1.829
--- mplayer.c	17 Jan 2005 21:28:29 -0000	1.828
+++ mplayer.c	21 Jan 2005 18:25:44 -0000	1.829
@@ -3417,7 +3417,7 @@
         if (vo_spudec != NULL)
           spudec_free(vo_spudec);
         vo_spudec =
-          spudec_new_scaled_vobsub(mkv_sh_sub->palette, mkv_sh_sub->colors,
+          spudec_new_scaled_vobsub(mkv_sh_sub->has_palette ? mkv_sh_sub->palette : NULL, mkv_sh_sub->colors,
                                    mkv_sh_sub->custom_colors,
                                    mkv_sh_sub->width,
                                    mkv_sh_sub->height);