Mercurial > mplayer.hg
changeset 18980:ed69754aa58d
Marks several string parameters as const when they are not modified in the function, Patch by Stefan Huehner, stefan AT huehner-org
| author | reynaldo |
|---|---|
| date | Sun, 09 Jul 2006 17:45:36 +0000 |
| parents | 494e8de479aa |
| children | b6462f808403 |
| files | codec-cfg.c codec-cfg.h libmpcodecs/ve.c libmpcodecs/vf.c libmpcodecs/vf.h libvo/font_load.c libvo/font_load.h libvo/font_load_ft.c mencoder.c subreader.c subreader.h |
| diffstat | 11 files changed, 16 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/codec-cfg.c Sun Jul 09 17:00:23 2006 +0000 +++ b/codec-cfg.c Sun Jul 09 17:45:36 2006 +0000 @@ -486,7 +486,7 @@ static int nr_vcodecs = 0; static int nr_acodecs = 0; -int parse_codec_cfg(char *cfgfile) +int parse_codec_cfg(const char *cfgfile) { codecs_t *codec = NULL; // current codec codecs_t **codecsp = NULL;// points to audio_codecs or to video_codecs
--- a/codec-cfg.h Sun Jul 09 17:00:23 2006 +0000 +++ b/codec-cfg.h Sun Jul 09 17:45:36 2006 +0000 @@ -58,7 +58,7 @@ short cpuflags; } codecs_t; -int parse_codec_cfg(char *cfgfile); +int parse_codec_cfg(const char *cfgfile); codecs_t* find_video_codec(unsigned int fourcc, unsigned int *fourccmap, codecs_t *start, int force); codecs_t* find_audio_codec(unsigned int fourcc, unsigned int *fourccmap,
--- a/libmpcodecs/ve.c Sun Jul 09 17:00:23 2006 +0000 +++ b/libmpcodecs/ve.c Sun Jul 09 17:45:36 2006 +0000 @@ -46,7 +46,7 @@ NULL }; -vf_instance_t* vf_open_encoder(vf_instance_t* next, char *name, char *args){ +vf_instance_t* vf_open_encoder(vf_instance_t* next, const char *name, char *args){ char* vf_args[] = { "_oldargs_", args, NULL }; return vf_open_plugin(encoder_list,next,name,vf_args); }
--- a/libmpcodecs/vf.c Sun Jul 09 17:00:23 2006 +0000 +++ b/libmpcodecs/vf.c Sun Jul 09 17:45:36 2006 +0000 @@ -436,7 +436,7 @@ return vf_next_query_format(vf,fmt); } -vf_instance_t* vf_open_plugin(vf_info_t** filter_list, vf_instance_t* next, char *name, char **args){ +vf_instance_t* vf_open_plugin(vf_info_t** filter_list, vf_instance_t* next, const char *name, char **args){ vf_instance_t* vf; int i; for(i=0;;i++){ @@ -475,7 +475,7 @@ return NULL; } -vf_instance_t* vf_open_filter(vf_instance_t* next, char *name, char **args){ +vf_instance_t* vf_open_filter(vf_instance_t* next, const char *name, char **args){ if(args && strcmp(args[0],"_oldargs_")) { int i,l = 0; for(i = 0 ; args && args[2*i] ; i++)
--- a/libmpcodecs/vf.h Sun Jul 09 17:00:23 2006 +0000 +++ b/libmpcodecs/vf.h Sun Jul 09 17:45:36 2006 +0000 @@ -89,10 +89,10 @@ void vf_mpi_clear(mp_image_t* mpi,int x0,int y0,int w,int h); mp_image_t* vf_get_image(vf_instance_t* vf, unsigned int outfmt, int mp_imgtype, int mp_imgflag, int w, int h); -vf_instance_t* vf_open_plugin(vf_info_t** filter_list, vf_instance_t* next, char *name, char **args); -vf_instance_t* vf_open_filter(vf_instance_t* next, char *name, char **args); +vf_instance_t* vf_open_plugin(vf_info_t** filter_list, vf_instance_t* next, const char *name, char **args); +vf_instance_t* vf_open_filter(vf_instance_t* next, const char *name, char **args); vf_instance_t* vf_add_before_vo(vf_instance_t **vf, char *name, char **args); -vf_instance_t* vf_open_encoder(vf_instance_t* next, char *name, char *args); +vf_instance_t* vf_open_encoder(vf_instance_t* next, const char *name, char *args); unsigned int vf_match_csp(vf_instance_t** vfp,unsigned int* list,unsigned int preferred); void vf_clone_mpi_attributes(mp_image_t* dst, mp_image_t* src);
--- a/libvo/font_load.c Sun Jul 09 17:00:23 2006 +0000 +++ b/libvo/font_load.c Sun Jul 09 17:45:36 2006 +0000 @@ -49,7 +49,7 @@ extern int sub_unicode; -font_desc_t* read_font_desc(char* fname,float factor,int verbose){ +font_desc_t* read_font_desc(const char* fname,float factor,int verbose){ unsigned char sor[1024]; unsigned char sor2[1024]; font_desc_t *desc;
--- a/libvo/font_load.h Sun Jul 09 17:00:23 2006 +0000 +++ b/libvo/font_load.h Sun Jul 09 17:45:36 2006 +0000 @@ -80,7 +80,7 @@ int init_freetype(void); int done_freetype(void); -font_desc_t* read_font_desc_ft(char* fname,int movie_width, int movie_height); +font_desc_t* read_font_desc_ft(const char* fname,int movie_width, int movie_height); void free_font_desc(font_desc_t *desc); void render_one_glyph(font_desc_t *desc, int c); @@ -96,6 +96,6 @@ #endif raw_file* load_raw(char *name,int verbose); -font_desc_t* read_font_desc(char* fname,float factor,int verbose); +font_desc_t* read_font_desc(const char* fname,float factor,int verbose); #endif /* ! __MPLAYER_FONT_LOAD_H */
--- a/libvo/font_load_ft.c Sun Jul 09 17:00:23 2006 +0000 +++ b/libvo/font_load_ft.c Sun Jul 09 17:45:36 2006 +0000 @@ -905,7 +905,7 @@ free(desc); } -static int load_sub_face(char *name, FT_Face *face) +static int load_sub_face(const char *name, FT_Face *face) { int err = -1; @@ -952,7 +952,7 @@ return f266ToInt(kern.x); } -font_desc_t* read_font_desc_ft(char *fname, int movie_width, int movie_height) +font_desc_t* read_font_desc_ft(const char *fname, int movie_width, int movie_height) { font_desc_t *desc;
--- a/mencoder.c Sun Jul 09 17:00:23 2006 +0000 +++ b/mencoder.c Sun Jul 09 17:45:36 2006 +0000 @@ -299,7 +299,7 @@ #include "libao2/audio_out.h" /* FIXME */ -static void mencoder_exit(int level, char *how) +static void mencoder_exit(int level, const char *how) { if (how) mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ExitingHow, how);
--- a/subreader.c Sun Jul 09 17:00:23 2006 +0000 +++ b/subreader.c Sun Jul 09 17:45:36 2006 +0000 @@ -1832,7 +1832,7 @@ } } -char** sub_filenames(char* path, char *fname) +char** sub_filenames(const char* path, char *fname) { char *f_dir, *f_fname, *f_fname_noext, *f_fname_trim, *tmp, *tmp_sub_id; char *tmp_fname_noext, *tmp_fname_trim, *tmp_fname_ext, *tmpresult;
--- a/subreader.h Sun Jul 09 17:00:23 2006 +0000 +++ b/subreader.h Sun Jul 09 17:45:36 2006 +0000 @@ -76,7 +76,7 @@ void* guess_buffer_cp(unsigned char* buffer, int buflen, char *preferred_language, char *fallback); void* guess_cp(struct stream_st *st, char *preferred_language, char *fallback); #endif -char ** sub_filenames(char *path, char *fname); +char ** sub_filenames(const char *path, char *fname); void list_sub_file(sub_data* subd); void dump_srt(sub_data* subd, float fps); void dump_mpsub(sub_data* subd, float fps);