[Mplayer-cvslog] CVS: main/libmpdemux demux_mkv.c, 1.21, 1.22 ebml.c, 1.2, 1.3

[Moritz Bunkus CVS]

CVS change done by Moritz Bunkus CVS

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

Modified Files:
	demux_mkv.c ebml.c 
Log Message:
Cosmetics: fix some compiler warnings.

Index: demux_mkv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- demux_mkv.c	24 Aug 2004 21:37:41 -0000	1.21
+++ demux_mkv.c	25 Aug 2004 07:52:51 -0000	1.22
@@ -373,6 +373,7 @@
 {
   int use_custom_colors, i;
 
+  use_custom_colors = 0;
   start += 14;
   while (isspace(*start))
     start++;
@@ -2343,6 +2344,7 @@
   int i;
 
   *all_lace_sizes = NULL;
+  lace_size = NULL;
   /* lacing flags */
   flags = *buffer++;
   (*size)--;

Index: ebml.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/ebml.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ebml.c	1 May 2004 18:34:23 -0000	1.2
+++ ebml.c	25 Aug 2004 07:52:52 -0000	1.3
@@ -51,7 +51,7 @@
   j = i+1;
   if (length)
     *length = j;
-  if ((num &= (len_mask - 1)) == len_mask - 1)
+  if ((int)(num &= (len_mask - 1)) == len_mask - 1)
     num_ffs++;
   while (i--)
     {
@@ -99,7 +99,7 @@
   j = i+1;
   if (length)
     *length = j;
-  if ((len &= (len_mask - 1)) == len_mask - 1)
+  if ((int)(len &= (len_mask - 1)) == len_mask - 1)
     num_ffs++;
   while (i--)
     {