diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-26 11:03:12 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-26 11:03:12 +0300 |
| commit | 529d1066274fc24c6a7ca5a8230c198167a5f7c0 (patch) | |
| tree | e773cd75f724f30fd9c18244392d89670fe4a9f0 /cfg-mencoder.h | |
| parent | fb33e286b5c23dbe8d0aeaf63cd3490bed3906e3 (diff) | |
| download | mpv-529d1066274fc24c6a7ca5a8230c198167a5f7c0.tar.bz2 mpv-529d1066274fc24c6a7ca5a8230c198167a5f7c0.tar.xz | |
Silence "discards qualifiers" warnings when compiling mplayer.c
Add casts to subconfig entries in option lists to avoid the excessive
amount of "initialization discards qualifiers from pointer target
type" warnings. Also add const to the type of mpctx_get_audio_out to
eliminate a warning and make it match the type in the header (svn
r25793 had added a const to the header but not mplayer.c). Make
libmenu_vfs a table of pointers to const to eliminate another warning
plus make the table itself const.
Diffstat (limited to 'cfg-mencoder.h')
| -rw-r--r-- | cfg-mencoder.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cfg-mencoder.h b/cfg-mencoder.h index cdc235f268..c02506c6ef 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -184,11 +184,11 @@ const m_option_t mencoder_opts[]={ {"xsize", "-xsize has been removed, use -vf crop=w:h:x:y for cropping.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, // output audio/video codec selection - {"oac", oac_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, - {"ovc", ovc_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, + {"oac", (void *) oac_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, + {"ovc", (void *) ovc_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, // output file format - {"of", of_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, + {"of", (void *) of_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, // override audio format tag in output file {"fafmttag", &force_audiofmttag, CONF_TYPE_INT, CONF_GLOBAL, 0, 0, NULL}, @@ -215,7 +215,7 @@ const m_option_t mencoder_opts[]={ {"noodml", &write_odml, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL}, // info header strings - {"info", info_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, + {"info", (void *) info_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, #ifdef HAVE_MP3LAME {"lameopts", lameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, |