[MPlayer-cvslog] CVS: main/libmpdemux demux_mkv.c, 1.36, 1.37 matroska.h, 1.17, 1.18

[Moritz Bunkus CVS]

CVS change done by Moritz Bunkus CVS

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

Modified Files:
	demux_mkv.c matroska.h 
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: demux_mkv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- demux_mkv.c	16 Jan 2005 14:59:19 -0000	1.36
+++ demux_mkv.c	21 Jan 2005 18:25:44 -0000	1.37
@@ -373,6 +373,7 @@
              t->sh_sub.palette[11], t->sh_sub.palette[12],
              t->sh_sub.palette[13], t->sh_sub.palette[14],
              t->sh_sub.palette[15]);
+      t->sh_sub.has_palette = 1;
       return 2;
     }
   return 0;
@@ -480,6 +481,7 @@
   memcpy(buf, t->private_data, t->private_size);
   buf[t->private_size] = 0;
   t->sh_sub.type = 'v';
+  t->sh_sub.has_palette = 0;
 
   pos = buf;
   start = buf;

Index: matroska.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/matroska.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- matroska.h	11 Jan 2005 08:30:56 -0000	1.17
+++ matroska.h	21 Jan 2005 18:25:44 -0000	1.18
@@ -59,6 +59,7 @@
 
 typedef struct {
   char type;                    // t = text, v = VobSub
+  int has_palette;              // If we have a valid palette
   unsigned int palette[16];     // for VobSubs
   int width, height;            // for VobSubs
   int custom_colors;