Compilation warning fixes and if-deffed unused functions/variables.

diff --git a/modules/packetizer/mpeg4video.c b/modules/packetizer/mpeg4video.c
index d31ab78f0c920eee13260e13d793c5738c5bc3da..ca2a948756c6ad20bca74c8b84b0eb7981015743 100644 (file)
--- a/modules/packetizer/mpeg4video.c
+++ b/modules/packetizer/mpeg4video.c
@@ -2,7 +2,7 @@
  * mpeg4video.c: mpeg 4 video packetizer
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: mpeg4video.c,v 1.20 2003/11/30 22:59:10 gbazin Exp $
+ * $Id: mpeg4video.c,v 1.21 2003/12/07 19:06:21 jpsaman Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *          Eric Petit <titer@videolan.org>
@@ -395,14 +395,19 @@ static int m4v_VOLParse( es_format_t *fmt, uint8_t *p_vol, int i_vol )
     i_ar = bs_read( &s, 4 );
     if( i_ar == 0xf )
     {
-        int i_ar_width = bs_read( &s, 8 );
-        int i_ar_height= bs_read( &s, 8 );
+        int i_ar_width, i_ar_height;
+
+        i_ar_width = bs_read( &s, 8 );
+        i_ar_height= bs_read( &s, 8 );
     }
     if( bs_read1( &s ) )
     {
+        int i_chroma_format;
+        int i_low_delay;
+
         /* vol control parameter */
-        int i_chroma_format = bs_read( &s, 2 );
-        int i_low_delay = bs_read1( &s );
+        i_chroma_format = bs_read( &s, 2 );
+        i_low_delay = bs_read1( &s );
 
         if( bs_read1( &s ) )
         {

diff --git a/modules/stream_out/dummy.c b/modules/stream_out/dummy.c
index d61caf9ea8454a1d71f13fb543baba106b3c7355..6b8572dd0a0992daa3cbfbc354b1cc52bccf56b7 100644 (file)
--- a/modules/stream_out/dummy.c
+++ b/modules/stream_out/dummy.c
@@ -2,7 +2,7 @@
  * dummy.c
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: dummy.c,v 1.2 2003/11/21 15:32:08 fenrir Exp $
+ * $Id: dummy.c,v 1.3 2003/12/07 19:06:21 jpsaman Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -72,8 +72,9 @@ static int Open( vlc_object_t *p_this )
 
 static void Close( vlc_object_t * p_this )
 {
+#if 0
     sout_stream_t   *p_stream = (sout_stream_t*)p_this;
-
+#endif
 }
 
 struct sout_stream_id_t

diff --git a/src/playlist/playlist.c b/src/playlist/playlist.c
index 84bb7507507513631e1db683bcf7c75611483daf..a2faf75ef4799563aef1ebc1bd6eabcbde54cc54 100644 (file)
--- a/src/playlist/playlist.c
+++ b/src/playlist/playlist.c
@@ -2,7 +2,7 @@
  * playlist.c : Playlist management functions
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: playlist.c,v 1.68 2003/12/04 16:02:54 sam Exp $
+ * $Id: playlist.c,v 1.69 2003/12/07 19:06:21 jpsaman Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -44,7 +44,9 @@ static void RunThread ( playlist_t * );
 static void SkipItem  ( playlist_t *, int );
 static void PlayItem  ( playlist_t * );
 
+#if 0
 static void Poubellize ( playlist_t *, input_thread_t * );
+#endif
 
 /**
  * Create playlist