* ALL: small portability fixes.

diff --git a/include/ninput.h b/include/ninput.h
index 3344d99cda5c986fcfd9283ae73156147e2af26e..b790a4d36713e2d9b1bbdda145aebbaa5bd64402 100644 (file)
--- a/include/ninput.h
+++ b/include/ninput.h
@@ -2,7 +2,7 @@
  * ninput.h
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: ninput.h,v 1.27 2004/01/31 05:24:55 fenrir Exp $
+ * $Id: ninput.h,v 1.28 2004/02/14 01:53:17 gbazin Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -54,7 +54,7 @@ enum es_out_query_e
     /* XXX XXX XXX Don't use them YET !!! */
     ES_OUT_SET_PCR,             /* arg1=int64_t i_pcr(microsecond!) (using default group 0)*/
     ES_OUT_SET_GROUP_PCR,       /* arg1= int i_group, arg2=int64_t i_pcr(microsecond!)*/
-    ES_OUT_RESET_PCR,   /* no arg */
+    ES_OUT_RESET_PCR    /* no arg */
 };
 
 struct es_out_t
@@ -118,7 +118,7 @@ enum stream_query_e
 
     STREAM_GET_SIZE,            /**< arg1= int64_t *      res=cannot fail (0 if no sense)*/
 
-    STREAM_GET_MTU,             /**< arg1= int *          res=cannot fail (0 if no sense)*/
+    STREAM_GET_MTU              /**< arg1= int *          res=cannot fail (0 if no sense)*/
 };
 
 /**
@@ -133,7 +133,7 @@ struct stream_t
     int      (*pf_peek)   ( stream_t *, uint8_t **pp_peek, int i_peek );
     int      (*pf_control)( stream_t *, int i_query, va_list );
 
-    stream_sys_t    *p_sys;
+    stream_sys_t *p_sys;
 };
 
 /**
@@ -286,10 +286,10 @@ enum demux_query_e
 
 
 /* Demux */
-VLC_EXPORT( int,            demux_vaControl,        ( input_thread_t *, int i_query, va_list  ) );
-VLC_EXPORT( int,            demux_Control,          ( input_thread_t *, int i_query, ...  ) );
+VLC_EXPORT( int, demux_vaControl,        ( input_thread_t *, int i_query, va_list  ) );
+VLC_EXPORT( int, demux_Control,          ( input_thread_t *, int i_query, ...  ) );
 
-VLC_EXPORT( int,            demux_vaControlDefault, ( input_thread_t *, int i_query, va_list  ) );
+VLC_EXPORT( int, demux_vaControlDefault, ( input_thread_t *, int i_query, va_list  ) );
 
 
 /* New demux arch: don't touch that */
@@ -319,11 +319,10 @@ static inline int demux2_Control( demux_t *p_demux, int i_query, ... )
 
 
 /* Subtitles */
-VLC_EXPORT( char **,        subtitles_Detect,       ( input_thread_t *, char* path, char *fname ) );
+VLC_EXPORT( char **, subtitles_Detect, ( input_thread_t *, char* path, char *fname ) );
 
 /**
  * @}
  */
 
 #endif
-

diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index a8996981b138a1dab343fef220a61d6b6a82f70b..aff4e010548815c9f8cb8aa6817c501a4d7b554d 100644 (file)
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -2,7 +2,7 @@
  * ts.c: Transport Stream input module for VLC.
  *****************************************************************************
  * Copyright (C) 2004 VideoLAN
- * $Id: ts.c,v 1.10 2004/02/01 04:50:13 fenrir Exp $
+ * $Id: ts.c,v 1.11 2004/02/14 01:53:17 gbazin Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -932,7 +932,7 @@ static void ParsePES ( demux_t *p_demux, ts_pid_t *pid )
     {
         msg_Warn( p_demux, "empty pes" );
     }
-};
+}
 
 static vlc_bool_t GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk )
 {

diff --git a/modules/demux/util/id3tag.c b/modules/demux/util/id3tag.c
index 7a80282fc8fe0bada8f3bf61d62e7025407de430..7c3972c06903d45e46d3301e31c96458b6b71337 100644 (file)
--- a/modules/demux/util/id3tag.c
+++ b/modules/demux/util/id3tag.c
@@ -2,7 +2,7 @@
  * id3tag.c: id3 tag parser/skipper based on libid3tag
  *****************************************************************************
  * Copyright (C) 2002-2004 VideoLAN
- * $Id: id3tag.c,v 1.20 2004/01/29 17:51:07 zorglub Exp $
+ * $Id: id3tag.c,v 1.21 2004/02/14 01:53:17 gbazin Exp $
  *
  * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
  *
@@ -85,6 +85,7 @@ static void ParseID3Tag( input_thread_t *p_input, uint8_t *p_data, int i_size )
 
     while ( ( p_frame = id3_tag_findframe( p_id3_tag , "T", i ) ) )
     {
+        int i_strings;
         playlist_item_t *p_item = playlist_ItemGetByPos( p_playlist, -1 );
         if( !p_item )
         {
@@ -94,7 +95,7 @@ static void ParseID3Tag( input_thread_t *p_input, uint8_t *p_data, int i_size )
 
         vlc_mutex_lock( &p_item->lock );
 
-        int i_strings = id3_field_getnstrings( &p_frame->fields[1] );
+        i_strings = id3_field_getnstrings( &p_frame->fields[1] );
 
         while ( i_strings > 0 )
         {