From 1642ed2fc3a7bd36ea5a63c72c3c90214886617c Mon Sep 17 00:00:00 2001
From: mosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 25 Aug 2004 07:52:52 +0000
Subject: Cosmetics: fix some compiler warnings.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13132 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpdemux/demux_mkv.c | 2 ++
 libmpdemux/ebml.c      | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'libmpdemux')

diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index 611a30afff..583974f73e 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -373,6 +373,7 @@ vobsub_parse_custom_colors (mkv_track_t *t, const char *start)
 {
   int use_custom_colors, i;
 
+  use_custom_colors = 0;
   start += 14;
   while (isspace(*start))
     start++;
@@ -2343,6 +2344,7 @@ demux_mkv_read_block_lacing (uint8_t *buffer, uint64_t *size,
   int i;
 
   *all_lace_sizes = NULL;
+  lace_size = NULL;
   /* lacing flags */
   flags = *buffer++;
   (*size)--;
diff --git a/libmpdemux/ebml.c b/libmpdemux/ebml.c
index 378c077fe2..ad6c2cb787 100644
--- a/libmpdemux/ebml.c
+++ b/libmpdemux/ebml.c
@@ -51,7 +51,7 @@ ebml_read_vlen_uint (uint8_t *buffer, int *length)
   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 @@ ebml_read_length (stream_t *s, int *length)
   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--)
     {
-- 
cgit v1.2.3