Commit bd2e2e8d authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Const fixes

parent de3972b9
...@@ -290,7 +290,7 @@ static struct ...@@ -290,7 +290,7 @@ static struct
{ {
uint16_t i_tag; uint16_t i_tag;
vlc_fourcc_t i_fourcc; vlc_fourcc_t i_fourcc;
char *psz_name; const char *psz_name;
} }
wave_format_tag_to_fourcc[] = wave_format_tag_to_fourcc[] =
{ {
...@@ -326,7 +326,7 @@ 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, static inline void wf_tag_to_fourcc( uint16_t i_tag, vlc_fourcc_t *fcc,
char **ppsz_name ) const char **ppsz_name )
{ {
int i; int i;
for( i = 0; wave_format_tag_to_fourcc[i].i_tag != 0; i++ ) for( i = 0; wave_format_tag_to_fourcc[i].i_tag != 0; i++ )
...@@ -355,7 +355,7 @@ static struct ...@@ -355,7 +355,7 @@ static struct
{ {
GUID guid_tag; GUID guid_tag;
vlc_fourcc_t i_fourcc; vlc_fourcc_t i_fourcc;
char *psz_name; const char *psz_name;
} }
sub_format_tag_to_fourcc[] = sub_format_tag_to_fourcc[] =
{ {
...@@ -371,7 +371,7 @@ static inline int guidcmp( const GUID *s1, const GUID *s2 ) ...@@ -371,7 +371,7 @@ static inline int guidcmp( const GUID *s1, const GUID *s2 )
} }
static inline void sf_tag_to_fourcc( GUID *guid_tag, 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; int i;
...@@ -390,7 +390,7 @@ static inline void sf_tag_to_fourcc( GUID *guid_tag, ...@@ -390,7 +390,7 @@ static inline void sf_tag_to_fourcc( GUID *guid_tag,
*/ */
typedef struct es_sys_t typedef struct es_sys_t
{ {
char *psz_header; /* for 'ssa ' and 'subt' */ char *psz_header; /* for 'ssa ' and 'subt' */
/* for spudec */ /* for spudec */
unsigned int i_orig_height; unsigned int i_orig_height;
......
...@@ -90,9 +90,9 @@ static void Play ( aout_instance_t * ); ...@@ -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 " \ #define WAV_LONGTEXT N_("Instead of writing a raw file, you can add a WAV " \
"header to the file.") "header to the file.")
static char *format_list[] = { "u8", "s8", "u16", "s16", "u16_le", "s16_le", static const char *format_list[] = { "u8", "s8", "u16", "s16", "u16_le",
"u16_be", "s16_be", "fixed32", "float32", "s16_le", "u16_be", "s16_be", "fixed32",
"spdif" }; "float32", "spdif" };
static int format_int[] = { VLC_FOURCC('u','8',' ',' '), static int format_int[] = { VLC_FOURCC('u','8',' ',' '),
VLC_FOURCC('s','8',' ',' '), VLC_FOURCC('s','8',' ',' '),
AOUT_FMT_U16_NE, AOUT_FMT_S16_NE, AOUT_FMT_U16_NE, AOUT_FMT_S16_NE,
...@@ -135,7 +135,7 @@ static int Open( vlc_object_t * p_this ) ...@@ -135,7 +135,7 @@ static int Open( vlc_object_t * p_this )
{ {
aout_instance_t * p_aout = (aout_instance_t *)p_this; aout_instance_t * p_aout = (aout_instance_t *)p_this;
char * psz_name, * psz_format; char * psz_name, * psz_format;
char ** ppsz_compare = format_list; const char ** ppsz_compare = format_list;
vlc_value_t val; vlc_value_t val;
int i_channels, i = 0; int i_channels, i = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment