Bunch of warning fixes.

diff --git a/modules/demux/asf/libasf.c b/modules/demux/asf/libasf.c
index 5a0ad888ffdfff63622e9cc6f03d76adece229e1..d68edeaab19878baff44ecf5f975a28f15bf9e5a 100644 (file)
--- a/modules/demux/asf/libasf.c
+++ b/modules/demux/asf/libasf.c
@@ -1419,7 +1419,7 @@ static void ASF_ObjectDumpDebug( vlc_object_t *p_obj,
     char str[1024];
     int i;
     union asf_object_u *p_child;
-    char *psz_name;
+    const char *psz_name;
 
     /* Find the name */
     for( i = 0; ASF_ObjectDumpDebugInfo[i].p_id != NULL; i++ )

diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index 4f9c44af35908224fb8743ec2b00472b6a3a8fd0..479ada43fafb5f7f032ade56a3d8c5cf3b267514 100644 (file)
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -2600,8 +2600,9 @@ static void __get_token( char **ppsz_path, char **ppsz_token, int *pi_number )
 }
 
 static void __MP4_BoxGet( MP4_Box_t **pp_result,
-                          MP4_Box_t *p_box, char *psz_fmt, va_list args)
+                          MP4_Box_t *p_box, const char *psz_fmt, va_list args)
 {
+    char *psz_dup;
     char    *psz_path;
 
     if( !p_box )
@@ -2620,7 +2621,7 @@ static void __MP4_BoxGet( MP4_Box_t **pp_result,
     }
 
 //    fprintf( stderr, "path:'%s'\n", psz_path );
-    psz_fmt = psz_path; /* keep this pointer, as it need to be unallocated */
+    psz_dup = psz_path; /* keep this pointer, as it need to be unallocated */
     for( ; ; )
     {
         char *psz_token;
@@ -2632,7 +2633,7 @@ static void __MP4_BoxGet( MP4_Box_t **pp_result,
         if( !psz_token )
         {
             FREENULL( psz_token );
-            free( psz_fmt );
+            free( psz_dup );
             *pp_result = p_box;
             return;
         }
@@ -2647,7 +2648,7 @@ static void __MP4_BoxGet( MP4_Box_t **pp_result,
             if( !p_box )
             {
                 free( psz_token );
-                free( psz_fmt );
+                free( psz_dup );
                 *pp_result = NULL;
                 return;
             }
@@ -2664,7 +2665,7 @@ static void __MP4_BoxGet( MP4_Box_t **pp_result,
             if( !p_box )
             {
                 free( psz_token );
-                free( psz_fmt );
+                free( psz_dup );
                 *pp_result = NULL;
                 return;
             }
@@ -2681,7 +2682,7 @@ static void __MP4_BoxGet( MP4_Box_t **pp_result,
                 if( !p_box )
                 {
                     free( psz_token );
-                    free( psz_fmt );
+                    free( psz_dup );
                     *pp_result = NULL;
                     return;
                 }
@@ -2705,7 +2706,7 @@ static void __MP4_BoxGet( MP4_Box_t **pp_result,
                 if( !p_box )
                 {
                     free( psz_token );
-                    free( psz_fmt );
+                    free( psz_dup );
                     *pp_result = NULL;
                     return;
                 }
@@ -2721,7 +2722,7 @@ static void __MP4_BoxGet( MP4_Box_t **pp_result,
         {
 //            fprintf( stderr, "Argg malformed token \"%s\"",psz_token );
             FREENULL( psz_token );
-            free( psz_fmt );
+            free( psz_dup );
             *pp_result = NULL;
             return;
         }
@@ -2739,7 +2740,7 @@ static void __MP4_BoxGet( MP4_Box_t **pp_result,
  * ex: /moov/trak[12]
  *     ../mdia
  *****************************************************************************/
-MP4_Box_t *MP4_BoxGet( MP4_Box_t *p_box, char *psz_fmt, ... )
+MP4_Box_t *MP4_BoxGet( MP4_Box_t *p_box, const char *psz_fmt, ... )
 {
     va_list args;
     MP4_Box_t *p_result;
@@ -2760,7 +2761,7 @@ MP4_Box_t *MP4_BoxGet( MP4_Box_t *p_box, char *psz_fmt, ... )
  * ex: /moov/trak[12]
  *     ../mdia
  *****************************************************************************/
-int MP4_BoxCount( MP4_Box_t *p_box, char *psz_fmt, ... )
+int MP4_BoxCount( MP4_Box_t *p_box, const char *psz_fmt, ... )
 {
     va_list args;
     int     i_count;

diff --git a/modules/demux/mp4/libmp4.h b/modules/demux/mp4/libmp4.h
index e60618aa637d16f8936f826001c9921c4bbf8b0d..b56be3b9437f796069ea738d1c05448d1f0110a1 100644 (file)
--- a/modules/demux/mp4/libmp4.h
+++ b/modules/demux/mp4/libmp4.h
@@ -932,7 +932,7 @@ void MP4_BoxDumpStructure( stream_t *p_input, MP4_Box_t *p_box );
  * ex: /moov/trak[12]
  *     ../mdia
  *****************************************************************************/
-MP4_Box_t *MP4_BoxGet( MP4_Box_t *p_box, char *psz_fmt, ... );
+MP4_Box_t *MP4_BoxGet( MP4_Box_t *p_box, const char *psz_fmt, ... );
 
 /*****************************************************************************
  * MP4_BoxCount: find number of box given a path relative to p_box
@@ -943,7 +943,7 @@ MP4_Box_t *MP4_BoxGet( MP4_Box_t *p_box, char *psz_fmt, ... );
  * ex: /moov/trak
  *     ../mdia
  *****************************************************************************/
-int MP4_BoxCount( MP4_Box_t *p_box, char *psz_fmt, ... );
+int MP4_BoxCount( MP4_Box_t *p_box, const char *psz_fmt, ... );
 
 int MP4_ReadBoxCommon( stream_t *p_stream, MP4_Box_t *p_box );
 int MP4_ReadBox_sample_vide( stream_t *p_stream, MP4_Box_t *p_box );

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 200f337067b5ff6642288e1c0e8a4ee870efe95c..7f9b5875c091f885bde10e7ba9c5034cb45eac34 100644 (file)
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -484,7 +484,7 @@ static int Open( vlc_object_t * p_this )
 
         if( p_sys->track[i].b_ok )
         {
-            char *psz_cat;
+            const char *psz_cat;
             switch( p_sys->track[i].fmt.i_cat )
             {
                 case( VIDEO_ES ):

diff --git a/modules/demux/nsc.c b/modules/demux/nsc.c
index a3be0b6280450b41a317ac26f9386f33e629b3c9..ca509f8e957d9f03ddd66a83634728754a1b1d77 100644 (file)
--- a/modules/demux/nsc.c
+++ b/modules/demux/nsc.c
@@ -136,7 +136,7 @@ static int load_byte( unsigned char encoding_type,
     return 0;
 }
 
-char *nscdec( vlc_object_t *p_demux, char* p_encoded )
+static char *nscdec( vlc_object_t *p_demux, char* p_encoded )
 {
     unsigned int i;
     unsigned char tmp;

diff --git a/modules/demux/tta.c b/modules/demux/tta.c
index d38b5563e9655d53f8cc48dbc5f6543792320884..e9c686637506651fd5a0f3d23776ff28283a6761 100644 (file)
--- a/modules/demux/tta.c
+++ b/modules/demux/tta.c
@@ -132,8 +132,8 @@ static int Open( vlc_object_t * p_this )
     /* Store the header and Seektable for avcodec */
     fmt.i_extra = 22 + (p_sys->i_totalframes * 4) + 4;
     fmt.p_extra = malloc( fmt.i_extra );
-    memcpy( fmt.p_extra, p_header, 22 );
-    memcpy( fmt.p_extra+22, p_seektable, fmt.i_extra -22 );
+    memcpy( (uint8_t*)fmt.p_extra, p_header, 22 );
+    memcpy( (uint8_t*)fmt.p_extra+22, p_seektable, fmt.i_extra -22 );
 
     p_sys->p_es = es_out_Add( p_demux->out, &fmt );
     free( p_seektable );

diff --git a/modules/demux/wav.c b/modules/demux/wav.c
index 8ca5298f7993bd1da070639ccb506c84dd914d04..97ae766e3dd4f7c12038dd479aac085d6e039f11 100644 (file)
--- a/modules/demux/wav.c
+++ b/modules/demux/wav.c
@@ -71,7 +71,7 @@ struct demux_sys_t
 
 #define __EVEN( x ) ( ( (x)%2 != 0 ) ? ((x)+1) : (x) )
 
-static int ChunkFind( demux_t *, char *, unsigned int * );
+static int ChunkFind( demux_t *, const char *, unsigned int * );
 
 static void FrameInfo_IMA_ADPCM( demux_t *, unsigned int *, int * );
 static void FrameInfo_MS_ADPCM ( demux_t *, unsigned int *, int * );
@@ -365,7 +365,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 /*****************************************************************************
  * Local functions
  *****************************************************************************/
-static int ChunkFind( demux_t *p_demux, char *fcc, unsigned int *pi_size )
+static int ChunkFind( demux_t *p_demux, const char *fcc, unsigned int *pi_size )
 {
     uint8_t *p_peek;