Const fixes

diff --git a/include/codecs.h b/include/codecs.h
index 99c2db820d901df4b9b853e1cfbf643a8f49e81f..315eaf15eddb2b1dc9e3117dd31a1dd6dd8e18f0 100644 (file)
--- a/include/codecs.h
+++ b/include/codecs.h
@@ -290,7 +290,7 @@ static struct
 {
     uint16_t     i_tag;
     vlc_fourcc_t i_fourcc;
-    char         *psz_name;
+    const char  *psz_name;
 }
 wave_format_tag_to_fourcc[] =
 {
@@ -326,7 +326,7 @@ wave_format_tag_to_fourcc[] =
 };
 
 static inline void wf_tag_to_fourcc( uint16_t i_tag, vlc_fourcc_t *fcc,
-                                     char **ppsz_name )
+                                     const char **ppsz_name )
 {
     int i;
     for( i = 0; wave_format_tag_to_fourcc[i].i_tag != 0; i++ )
@@ -355,7 +355,7 @@ static struct
 {
     GUID         guid_tag;
     vlc_fourcc_t i_fourcc;
-    char         *psz_name;
+    const char  *psz_name;
 }
 sub_format_tag_to_fourcc[] =
 {
@@ -371,7 +371,7 @@ static inline int guidcmp( const GUID *s1, const GUID *s2 )
 }
 
 static inline void sf_tag_to_fourcc( GUID *guid_tag,
-                                     vlc_fourcc_t *fcc, char **ppsz_name )
+                                     vlc_fourcc_t *fcc, const char **ppsz_name )
 {
     int i;
 
@@ -390,7 +390,7 @@ static inline void sf_tag_to_fourcc( GUID *guid_tag,
  */
 typedef struct es_sys_t
 {
-    char        *psz_header; /* for 'ssa ' and 'subt' */
+    char               *psz_header; /* for 'ssa ' and 'subt' */
 
     /* for spudec */
     unsigned int        i_orig_height;

diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c
index 7b05249cce1a3faf97e62c5e119638e972d9b0a5..ce28c9235245d77253caf71debde2a9016296ef1 100644 (file)
--- a/modules/audio_output/file.c
+++ b/modules/audio_output/file.c
@@ -90,9 +90,9 @@ static void    Play        ( aout_instance_t * );
 #define WAV_LONGTEXT N_("Instead of writing a raw file, you can add a WAV " \
                         "header to the file.")
 
-static char *format_list[] = { "u8", "s8", "u16", "s16", "u16_le", "s16_le",
-                               "u16_be", "s16_be", "fixed32", "float32",
-                               "spdif" };
+static const char *format_list[] = { "u8", "s8", "u16", "s16", "u16_le",
+                                     "s16_le", "u16_be", "s16_be", "fixed32",
+                                     "float32", "spdif" };
 static int format_int[] = { VLC_FOURCC('u','8',' ',' '),
                             VLC_FOURCC('s','8',' ',' '),
                             AOUT_FMT_U16_NE, AOUT_FMT_S16_NE,
@@ -135,7 +135,7 @@ static int Open( vlc_object_t * p_this )
 {
     aout_instance_t * p_aout = (aout_instance_t *)p_this;
     char * psz_name, * psz_format;
-    char ** ppsz_compare = format_list;
+    const char ** ppsz_compare = format_list;
     vlc_value_t val;
     int i_channels, i = 0;