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-mplayer.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-mplayer.h')
| -rw-r--r-- | cfg-mplayer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h index c8e2f0f632..1f8bd131b6 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -347,7 +347,7 @@ const m_option_t mplayer_opts[]={ {"nomouse-movements", &enable_mouse_movements, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL}, {"doubleclick-time", &doubleclick_time, CONF_TYPE_INT, CONF_RANGE, 0, 1000, NULL}, #ifdef USE_TV - {"tvscan", tvscan_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, + {"tvscan", (void *) tvscan_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, #else {"tvscan", "MPlayer was compiled without TV interface support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, #endif /* USE_TV */ @@ -360,7 +360,7 @@ const m_option_t mplayer_opts[]={ {"help", help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL}, {"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL}, - {"vd", vd_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, + {"vd", (void *) vd_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, {NULL, NULL, 0, 0, 0, 0, NULL} }; |